hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jiang Liu 2013-07-03 15:03:43 -07:00 committed by Linus Torvalds
parent 7ee3d4e8cd
commit 0ed5fd1385
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/fuse/inode.c
View File

@ -785,7 +785,7 @@ static const struct super_operations fuse_super_operations = {
static void sanitize_global_limit(unsigned *limit) static void sanitize_global_limit(unsigned *limit)
{ {
if (*limit == 0) if (*limit == 0)
*limit = ((num_physpages << PAGE_SHIFT) >> 13) / *limit = ((totalram_pages << PAGE_SHIFT) >> 13) /
sizeof(struct fuse_req); sizeof(struct fuse_req);
if (*limit >= 1 << 16) if (*limit >= 1 << 16)

4
kernel/power/snapshot.c
View File

@ -1651,7 +1651,7 @@ unsigned long snapshot_get_image_size(void)
static int init_header(struct swsusp_info *info) static int init_header(struct swsusp_info *info)
{ {
memset(info, 0, sizeof(struct swsusp_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->image_pages = nr_copy_pages;
info->pages = snapshot_get_image_size(); info->pages = snapshot_get_image_size();
info->size = info->pages; info->size = info->pages;
@ -1795,7 +1795,7 @@ static int check_header(struct swsusp_info *info)
char *reason; char *reason;
reason = check_image_kernel(info); reason = check_image_kernel(info);
if (!reason && info->num_physpages != num_physpages) if (!reason && info->num_physpages != get_num_physpages())
reason = "memory size"; reason = "memory size";
if (reason) { if (reason) {
printk(KERN_ERR "PM: Image mismatch: %s\n", reason); printk(KERN_ERR "PM: Image mismatch: %s\n", reason);

2
net/ipv4/inet_fragment.c
View File

@ -93,7 +93,7 @@ void inet_frags_init(struct inet_frags *f)
} }
rwlock_init(&f->lock); rwlock_init(&f->lock);
f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^ f->rnd = (u32) ((totalram_pages ^ (totalram_pages >> 7)) ^
(jiffies ^ (jiffies >> 6))); (jiffies ^ (jiffies >> 6)));
setup_timer(&f->secret_timer, inet_frag_secret_rebuild, setup_timer(&f->secret_timer, inet_frag_secret_rebuild,