Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0efc8eb9 authored by Bob Liu's avatar Bob Liu Committed by Linus Torvalds
Browse files

page_cgroup: drop multi CONFIG_MEMORY_HOTPLUG 



No need for two CONFIG_MEMORY_HOTPLUG blocks.

Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d0048b0e

mm/page_cgroup.c

+14 −16
Original line number Original line Diff line number Diff line
@@ -124,22 +124,6 @@ static void *__meminit alloc_page_cgroup(size_t size, int nid) 
	return addr;

	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)

static int __meminit init_section_page_cgroup(unsigned long pfn, int nid)

{

{

	struct mem_section *section;

	struct mem_section *section;
@@ -176,6 +160,20 @@ static int __meminit init_section_page_cgroup(unsigned long pfn, int nid) 
	return 0;

	return 0;

}

}

#ifdef CONFIG_MEMORY_HOTPLUG

#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)

void __free_page_cgroup(unsigned long pfn)

{

{

	struct mem_section *ms;

	struct mem_section *ms;