mm: use totalram_pages instead of num_physpages at runtime

The global variable num_physpages is scheduled to be removed, so use
totalram_pages instead of num_physpages at runtime.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 9a0cdde14a088c43e12e5d5fc4ba84257ca98b46..0b578598c6ac8a66f17ed7f4511d7ec0cf9132db 100644 (file)
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -785,7 +785,7 @@ static const struct super_operations fuse_super_operations = {
 static void sanitize_global_limit(unsigned *limit)
 {
        if (*limit == 0)
-               *limit = ((num_physpages << PAGE_SHIFT) >> 13) /
+               *limit = ((totalram_pages << PAGE_SHIFT) >> 13) /
                         sizeof(struct fuse_req);
 
        if (*limit >= 1 << 16)

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 0de28576807df9e7dc5be5f05d75a0faa937caf2..8b5d1cd933f41e98f05e0fa765e4891ce91c38fe 100644 (file)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1651,7 +1651,7 @@ unsigned long snapshot_get_image_size(void)
 static int init_header(struct swsusp_info *info)
 {
        memset(info, 0, sizeof(struct swsusp_info));
-       info->num_physpages = num_physpages;
+       info->num_physpages = get_num_physpages();
        info->image_pages = nr_copy_pages;
        info->pages = snapshot_get_image_size();
        info->size = info->pages;
@@ -1795,7 +1795,7 @@ static int check_header(struct swsusp_info *info)
        char *reason;
 
        reason = check_image_kernel(info);
-       if (!reason && info->num_physpages != num_physpages)
+       if (!reason && info->num_physpages != get_num_physpages())
                reason = "memory size";
        if (reason) {
                printk(KERN_ERR "PM: Image mismatch: %s\n", reason);

diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 7e06641e36ae785239f32b1d5afb80e504e0c60b..cec539458307559814a6b0bfc527603594cbe99a 100644 (file)
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -93,7 +93,7 @@ void inet_frags_init(struct inet_frags *f)
        }
        rwlock_init(&f->lock);
 
-       f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^
+       f->rnd = (u32) ((totalram_pages ^ (totalram_pages >> 7)) ^
                                   (jiffies ^ (jiffies >> 6)));
 
        setup_timer(&f->secret_timer, inet_frag_secret_rebuild,