On Tue 12-04-11 11:35:34, Namhyung Kim wrote: > The commit ca371c0d7e23 ("memcg: fix page_cgroup fatal error > in FLATMEM") removes call to alloc_bootmem() in the function > so that it can be marked as __meminit to reduce memory usage > when MEMORY_HOTPLUG=n. > > Also as new helper function alloc_page_cgroup() is called only > in the function, it should be marked too. > > Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx> > Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> > Acked-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx> > Cc: Michal Hocko <mhocko@xxxxxxx> I am not aware I would be involved in the first round, but yes this looks correct and reasonable. You can add my Reviewed-by: Michal Hocko <mhocko@xxxxxxx> if you care. > --- > I kept Acked-by's because it seemed like a trivial change, no? > > mm/page_cgroup.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c > index 99055010cece..81205c52735c 100644 > --- a/mm/page_cgroup.c > +++ b/mm/page_cgroup.c > @@ -130,7 +130,7 @@ struct page *lookup_cgroup_page(struct page_cgroup *pc) > return page; > } > > -static void *__init_refok alloc_page_cgroup(size_t size, int nid) > +static void *__meminit alloc_page_cgroup(size_t size, int nid) > { > void *addr = NULL; > > @@ -162,7 +162,7 @@ static void free_page_cgroup(void *addr) > } > #endif > > -static int __init_refok init_section_page_cgroup(unsigned long pfn) > +static int __meminit init_section_page_cgroup(unsigned long pfn) > { > struct page_cgroup *base, *pc; > struct mem_section *section; > -- > 1.7.4 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@xxxxxxxxxx For more info on Linux MM, > see: http://www.linux-mm.org/ . > Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ > Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a> -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>