Messages in this thread | | | Date | Sun, 24 Mar 2013 16:27:52 +0400 | From | Sergei Shtylyov <> | Subject | Re: [RFC PATCH v2, part4 37/39] mm: use totalram_pages instead of num_physpages at runtime |
| |
Hello.
On 24-03-2013 11:25, Jiang Liu wrote:
> 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> > Cc: fuse-devel@lists.sourceforge.net > Cc: linux-kernel@vger.kernel.org > Cc: netdev@vger.kernel.org > --- > fs/fuse/inode.c | 2 +- > kernel/power/snapshot.c | 4 ++-- > 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 b730fda..4c2a420 100644 > --- a/fs/fuse/inode.c > +++ b/fs/fuse/inode.c > @@ -781,7 +781,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 0de2857..8b5d1cd 100644 > --- 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 4750d2b..94a99a1 100644 > --- a/net/ipv4/inet_fragment.c > +++ b/net/ipv4/inet_fragment.c > @@ -60,7 +60,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,
Isn't patch 37 the same as patch 9?
WBR, Sergei
| |