From: Jiang L. <li...@gm...> - 2013-03-24 07:28:32
|
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 <jia...@hu...> Cc: Miklos Szeredi <mi...@sz...> Cc: "David S. Miller" <da...@da...> Cc: Alexey Kuznetsov <ku...@ms...> Cc: James Morris <jm...@na...> Cc: Hideaki YOSHIFUJI <yos...@li...> Cc: Patrick McHardy <ka...@tr...> Cc: fus...@li... Cc: lin...@vg... Cc: ne...@vg... --- 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, -- 1.7.9.5 |
From: Jiang L. <li...@gm...> - 2013-03-24 07:36:26
|
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 <jia...@hu...> Cc: Miklos Szeredi <mi...@sz...> Cc: "David S. Miller" <da...@da...> Cc: Alexey Kuznetsov <ku...@ms...> Cc: James Morris <jm...@na...> Cc: Hideaki YOSHIFUJI <yos...@li...> Cc: Patrick McHardy <ka...@tr...> Cc: fus...@li... Cc: lin...@vg... Cc: ne...@vg... --- 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, -- 1.7.9.5 |
From: Sergei S. <ser...@co...> - 2013-03-24 12:29:05
|
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 <jia...@hu...> > Cc: Miklos Szeredi <mi...@sz...> > Cc: "David S. Miller" <da...@da...> > Cc: Alexey Kuznetsov <ku...@ms...> > Cc: James Morris <jm...@na...> > Cc: Hideaki YOSHIFUJI <yos...@li...> > Cc: Patrick McHardy <ka...@tr...> > Cc: fus...@li... > Cc: lin...@vg... > Cc: ne...@vg... > --- > 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 |
From: Jiang L. <li...@gm...> - 2013-03-26 15:58:36
|
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 <jia...@hu...> Cc: Miklos Szeredi <mi...@sz...> Cc: "David S. Miller" <da...@da...> Cc: Alexey Kuznetsov <ku...@ms...> Cc: James Morris <jm...@na...> Cc: Hideaki YOSHIFUJI <yos...@li...> Cc: Patrick McHardy <ka...@tr...> Cc: fus...@li... Cc: lin...@vg... Cc: ne...@vg... --- Hi all, Sorry for my mistake that my previous patch series has been screwed up. So I regenerate a third version and also set up a git tree at: git://github.com/jiangliu/linux.git mem_init Any help to review and test are welcomed! Regards! Gerry --- 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..87c4b09 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, -- 1.7.9.5 |
From: Jiang L. <li...@gm...> - 2013-04-06 14:43:24
|
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 <jia...@hu...> Cc: Miklos Szeredi <mi...@sz...> Cc: "David S. Miller" <da...@da...> Cc: Alexey Kuznetsov <ku...@ms...> Cc: James Morris <jm...@na...> Cc: Hideaki YOSHIFUJI <yos...@li...> Cc: Patrick McHardy <ka...@tr...> Cc: fus...@li... Cc: lin...@vg... Cc: ne...@vg... --- 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 137185c..0bca95d 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -782,7 +782,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 2bff045..425eb23 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -83,7 +83,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, -- 1.7.9.5 |
From: Jiang L. <li...@gm...> - 2013-05-08 15:54:31
|
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 <jia...@hu...> Cc: Miklos Szeredi <mi...@sz...> Cc: "David S. Miller" <da...@da...> Cc: Alexey Kuznetsov <ku...@ms...> Cc: James Morris <jm...@na...> Cc: Hideaki YOSHIFUJI <yos...@li...> Cc: Patrick McHardy <ka...@tr...> Cc: fus...@li... Cc: lin...@vg... Cc: ne...@vg... --- 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 17ec1f7..cd6dc27 100644 --- 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 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 e97d66a..f90079d 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, -- 1.7.9.5 |
From: Jiang L. <li...@gm...> - 2013-05-29 13:58:52
|
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 <jia...@hu...> Cc: Miklos Szeredi <mi...@sz...> Cc: "David S. Miller" <da...@da...> Cc: Alexey Kuznetsov <ku...@ms...> Cc: James Morris <jm...@na...> Cc: Hideaki YOSHIFUJI <yos...@li...> Cc: Patrick McHardy <ka...@tr...> Cc: fus...@li... Cc: lin...@vg... Cc: ne...@vg... --- 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 6201f81..c2d44ef 100644 --- 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 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 7e06641..cec5394 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, -- 1.8.1.2 |
From: Sergei S. <ser...@co...> - 2013-03-24 12:28:08
|
Hello. On 24-03-2013 11:24, 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 <jia...@hu...> > Cc: Miklos Szeredi <mi...@sz...> > Cc: "David S. Miller" <da...@da...> > Cc: Alexey Kuznetsov <ku...@ms...> > Cc: James Morris <jm...@na...> > Cc: Hideaki YOSHIFUJI <yos...@li...> > Cc: Patrick McHardy <ka...@tr...> > Cc: fus...@li... > Cc: lin...@vg... > Cc: ne...@vg... [...] > 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)) ^ Wouldn't hurt to add spaces around >> for consistency's sake. > (jiffies ^ (jiffies >> 6))); > > setup_timer(&f->secret_timer, inet_frag_secret_rebuild, WBR, Sergei |