diff options
| author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 15:03:43 -0700 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-12-01 14:33:34 +0800 |
| commit | 9e984668c9a0a11ee95e7e12bf835e498fd8ffc8 (patch) | |
| tree | c0a98e0bc08568400a3cd747945b8fb83a2df31a | |
| parent | 38df2e323cdd05d205ac071e6d39c617a49ab8f6 (diff) | |
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>
(cherry picked from commit 0ed5fd138539940a493dc69359cb2f49de70ad89)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | fs/fuse/inode.c | 2 | ||||
| -rw-r--r-- | kernel/power/snapshot.c | 4 | ||||
| -rw-r--r-- | net/ipv4/inet_fragment.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 09eef07afeb2..4f546e9168c0 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -799,7 +799,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 91c04f16e79c..7e8c4e3728c7 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1655,7 +1655,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; @@ -1799,7 +1799,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 66cfb6b283a2..12b80fbfe767 100644 --- 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, |