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

Commit 180c06ef authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Linus Torvalds
Browse files

hotplug-memory: make online_page() common 



All architectures use an effectively identical definition of online_page(), so
just make it common code.  x86-64, ia64, powerpc and sh are actually
identical; x86-32 is slightly different.

x86-32's differences arise because it puts its hotplug pages in the highmem
zone.  We can handle this in the generic code by inspecting the page to see if
its in highmem, and update the totalhigh_pages count appropriately.  This
leaves init_32.c:free_new_highpage with a single caller, so I folded it into
add_one_highpage_init.

I also removed an incorrect comment referring to the NUMA case; any NUMA
details have already been dealt with by the time online_page() is called.

[akpm@linux-foundation.org: fix indenting]
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Acked-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamez.hiroyu@jp.fujitsu.com>
Tested-by: default avatarKAMEZAWA Hiroyuki <kamez.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Christoph Lameter <clameter@sgi.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea01ea93

arch/ia64/mm/init.c

+0 −9
Original line number Diff line number Diff line
@@ -682,15 +682,6 @@ mem_init (void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

void online_page(struct page *page)

{

	ClearPageReserved(page);

	init_page_count(page);

	__free_page(page);

	totalram_pages++;

	num_physpages++;

}



int arch_add_memory(int nid, u64 start, u64 size)

{

	pg_data_t *pgdat;

arch/powerpc/mm/mem.c

+0 −9
Original line number Diff line number Diff line
@@ -110,15 +110,6 @@ EXPORT_SYMBOL(phys_mem_access_prot); 


#ifdef CONFIG_MEMORY_HOTPLUG



void online_page(struct page *page)

{

	ClearPageReserved(page);

	init_page_count(page);

	__free_page(page);

	totalram_pages++;

	num_physpages++;

}



#ifdef CONFIG_NUMA

int memory_add_physaddr_to_nid(u64 start)

{

arch/sh/mm/init.c

+0 −9
Original line number Diff line number Diff line
@@ -307,15 +307,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
#endif



#ifdef CONFIG_MEMORY_HOTPLUG

void online_page(struct page *page)

{

	ClearPageReserved(page);

	init_page_count(page);

	__free_page(page);

	totalram_pages++;

	num_physpages++;

}



int arch_add_memory(int nid, u64 start, u64 size)

{

	pg_data_t *pgdat;

arch/x86/mm/init_32.c

+3 −33
Original line number Diff line number Diff line
@@ -287,47 +287,17 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base) 
	pkmap_page_table = pte;

}



static void __meminit free_new_highpage(struct page *page)

{

	init_page_count(page);

	__free_page(page);

	totalhigh_pages++;

}



void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)

{

	if (page_is_ram(pfn) && !(bad_ppro && page_kills_ppro(pfn))) {

		ClearPageReserved(page);

		free_new_highpage(page);

		init_page_count(page);

		__free_page(page);

		totalhigh_pages++;

	} else

		SetPageReserved(page);

}



static int __meminit

add_one_highpage_hotplug(struct page *page, unsigned long pfn)

{

	free_new_highpage(page);

	totalram_pages++;

#ifdef CONFIG_FLATMEM

	max_mapnr = max(pfn, max_mapnr);

#endif

	num_physpages++;



	return 0;

}



/*

 * Not currently handling the NUMA case.

 * Assuming single node and all memory that

 * has been added dynamically that would be

 * onlined here is in HIGHMEM.

 */

void __meminit online_page(struct page *page)

{

	ClearPageReserved(page);

	add_one_highpage_hotplug(page, page_to_pfn(page));

}



#ifndef CONFIG_NUMA

static void __init set_highmem_pages_init(int bad_ppro)

{

arch/x86/mm/init_64.c

+0 −9
Original line number Diff line number Diff line
@@ -620,15 +620,6 @@ void __init paging_init(void) 
/*

 * Memory hotplug specific functions

 */

void online_page(struct page *page)

{

	ClearPageReserved(page);

	init_page_count(page);

	__free_page(page);

	totalram_pages++;

	num_physpages++;

}



#ifdef CONFIG_MEMORY_HOTPLUG

/*

 * Memory is added always to NORMAL zone. This means you will never get