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

Commit f28c5edc authored by Keith Mannthey's avatar Keith Mannthey Committed by Linus Torvalds
Browse files

[PATCH] hot-add-mem x86_64: fixup externs 



Fix up externs in memory_hotplug.c.  Cleanup.

Signed-off-by: default avatarKeith Mannthey <kmannth@us.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 236561e5

include/linux/memory_hotplug.h

+2 −0
Original line number Diff line number Diff line
@@ -172,5 +172,7 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn, 
extern int add_memory(int nid, u64 start, u64 size);

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

extern int remove_memory(u64 start, u64 size);

extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,

								int nr_pages);



#endif /* __LINUX_MEMORY_HOTPLUG_H */

include/linux/mm.h

+2 −0
Original line number Diff line number Diff line
@@ -946,6 +946,8 @@ extern void mem_init(void); 
extern void show_mem(void);

extern void si_meminfo(struct sysinfo * val);

extern void si_meminfo_node(struct sysinfo *val, int nid);

extern void zonetable_add(struct zone *zone, int nid, enum zone_type zid,

					unsigned long pfn, unsigned long size);



#ifdef CONFIG_NUMA

extern void setup_per_cpu_pageset(void);

mm/memory_hotplug.c

+0 −4
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 


#include <asm/tlbflush.h>



extern void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn,

			  unsigned long size);

static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)

{

	struct pglist_data *pgdat = zone->zone_pgdat;
@@ -47,8 +45,6 @@ static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) 
	return 0;

}



extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,

				  int nr_pages);

static int __add_section(struct zone *zone, unsigned long phys_start_pfn)

{

	int nr_pages = PAGES_PER_SECTION;