From: Keith Mannthey fixup externs in memory_hotplug.c. Cleanup. Signed-off-by: Keith Mannthey Cc: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton --- include/linux/memory_hotplug.h | 2 ++ include/linux/mm.h | 2 ++ mm/memory_hotplug.c | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) diff -puN include/linux/memory_hotplug.h~hot-add-mem-x86_64-fixup-externs include/linux/memory_hotplug.h --- a/include/linux/memory_hotplug.h~hot-add-mem-x86_64-fixup-externs +++ a/include/linux/memory_hotplug.h @@ -172,5 +172,7 @@ static inline int __remove_pages(struct 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 */ diff -puN include/linux/mm.h~hot-add-mem-x86_64-fixup-externs include/linux/mm.h --- a/include/linux/mm.h~hot-add-mem-x86_64-fixup-externs +++ a/include/linux/mm.h @@ -885,6 +885,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, int zid, + unsigned long pfn, unsigned long size); #ifdef CONFIG_NUMA extern void setup_per_cpu_pageset(void); diff -puN mm/memory_hotplug.c~hot-add-mem-x86_64-fixup-externs mm/memory_hotplug.c --- a/mm/memory_hotplug.c~hot-add-mem-x86_64-fixup-externs +++ a/mm/memory_hotplug.c @@ -24,8 +24,6 @@ #include -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; @@ -45,8 +43,6 @@ static int __add_zone(struct zone *zone, 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; _