Subject: [merged] mm-use-totalram_pages-instead-of-num_physpages-at-runtime.patch removed from -mm tree
To: liuj97@xxxxxxxxx,davem@xxxxxxxxxxxxx,jiang.liu@xxxxxxxxxx,jmorris@xxxxxxxxx,kaber@xxxxxxxxx,kuznet@xxxxxxxxxxxxx,miklos@xxxxxxxxxx,yoshfuji@xxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 08 Jul 2013 12:26:50 -0700
The patch titled
Subject: mm: use totalram_pages instead of num_physpages at runtime
has been removed from the -mm tree. Its filename was
mm-use-totalram_pages-instead-of-num_physpages-at-runtime.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jiang Liu <liuj97@xxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Miklos Szeredi <miklos@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Alexey Kuznetsov <kuznet@xxxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/fuse/inode.c | 2 +-
kernel/power/snapshot.c | 4 ++--
net/ipv4/inet_fragment.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff -puN fs/fuse/inode.c~mm-use-totalram_pages-instead-of-num_physpages-at-runtime fs/fuse/inode.c
--- a/fs/fuse/inode.c~mm-use-totalram_pages-instead-of-num_physpages-at-runtime
+++ a/fs/fuse/inode.c
@@ -785,7 +785,7 @@ static const struct super_operations fus
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 -puN kernel/power/snapshot.c~mm-use-totalram_pages-instead-of-num_physpages-at-runtime kernel/power/snapshot.c
--- a/kernel/power/snapshot.c~mm-use-totalram_pages-instead-of-num_physpages-at-runtime
+++ a/kernel/power/snapshot.c
@@ -1651,7 +1651,7 @@ unsigned long snapshot_get_image_size(vo
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_in
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 -puN net/ipv4/inet_fragment.c~mm-use-totalram_pages-instead-of-num_physpages-at-runtime net/ipv4/inet_fragment.c
--- a/net/ipv4/inet_fragment.c~mm-use-totalram_pages-instead-of-num_physpages-at-runtime
+++ a/net/ipv4/inet_fragment.c
@@ -93,7 +93,7 @@ void inet_frags_init(struct inet_frags *
}
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,
_
Patches currently in -mm which might be from liuj97@xxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
