On Tue 20-12-11 18:03:41, Bob Liu wrote:
> No need two CONFIG_MEMORY_HOTPLUG place.
I originally wanted to have alloc and dealloc at one location but this
makes sense as well.
>
> Signed-off-by: Bob Liu <lliubbo@xxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxx>
Thanks
> ---
> mm/page_cgroup.c | 30 ++++++++++++++----------------
> 1 files changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
> index b99d19e..de1616a 100644
> --- a/mm/page_cgroup.c
> +++ b/mm/page_cgroup.c
> @@ -124,22 +124,6 @@ static void *__meminit alloc_page_cgroup(size_t size, int nid)
> return addr;
> }
>
> -#ifdef CONFIG_MEMORY_HOTPLUG
> -static void free_page_cgroup(void *addr)
> -{
> - if (is_vmalloc_addr(addr)) {
> - vfree(addr);
> - } else {
> - struct page *page = virt_to_page(addr);
> - size_t table_size =
> - sizeof(struct page_cgroup) * PAGES_PER_SECTION;
> -
> - BUG_ON(PageReserved(page));
> - free_pages_exact(addr, table_size);
> - }
> -}
> -#endif
> -
> static int __meminit init_section_page_cgroup(unsigned long pfn, int nid)
> {
> struct mem_section *section;
> @@ -176,6 +160,20 @@ static int __meminit init_section_page_cgroup(unsigned long pfn, int nid)
> return 0;
> }
> #ifdef CONFIG_MEMORY_HOTPLUG
> +static void free_page_cgroup(void *addr)
> +{
> + if (is_vmalloc_addr(addr)) {
> + vfree(addr);
> + } else {
> + struct page *page = virt_to_page(addr);
> + size_t table_size =
> + sizeof(struct page_cgroup) * PAGES_PER_SECTION;
> +
> + BUG_ON(PageReserved(page));
> + free_pages_exact(addr, table_size);
> + }
> +}
> +
> void __free_page_cgroup(unsigned long pfn)
> {
> struct mem_section *ms;
> --
> 1.7.0.4
>
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@xxxxxxxxx. 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@xxxxxxxxx. 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>