aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memory_hotplug.h2
-rw-r--r--include/linux/mm.h2
-rw-r--r--mm/memory_hotplug.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 218501cfaeb9..7b54666cea8e 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -172,5 +172,7 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
172extern int add_memory(int nid, u64 start, u64 size); 172extern int add_memory(int nid, u64 start, u64 size);
173extern int arch_add_memory(int nid, u64 start, u64 size); 173extern int arch_add_memory(int nid, u64 start, u64 size);
174extern int remove_memory(u64 start, u64 size); 174extern int remove_memory(u64 start, u64 size);
175extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
176 int nr_pages);
175 177
176#endif /* __LINUX_MEMORY_HOTPLUG_H */ 178#endif /* __LINUX_MEMORY_HOTPLUG_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4edf1934e5ca..b7966ab8cb6a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -946,6 +946,8 @@ extern void mem_init(void);
946extern void show_mem(void); 946extern void show_mem(void);
947extern void si_meminfo(struct sysinfo * val); 947extern void si_meminfo(struct sysinfo * val);
948extern void si_meminfo_node(struct sysinfo *val, int nid); 948extern void si_meminfo_node(struct sysinfo *val, int nid);
949extern void zonetable_add(struct zone *zone, int nid, enum zone_type zid,
950 unsigned long pfn, unsigned long size);
949 951
950#ifdef CONFIG_NUMA 952#ifdef CONFIG_NUMA
951extern void setup_per_cpu_pageset(void); 953extern void setup_per_cpu_pageset(void);
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 2053bb165a21..63b14d4f68fb 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -26,8 +26,6 @@
26 26
27#include <asm/tlbflush.h> 27#include <asm/tlbflush.h>
28 28
29extern void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn,
30 unsigned long size);
31static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) 29static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)
32{ 30{
33 struct pglist_data *pgdat = zone->zone_pgdat; 31 struct pglist_data *pgdat = zone->zone_pgdat;
@@ -47,8 +45,6 @@ static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)
47 return 0; 45 return 0;
48} 46}
49 47
50extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
51 int nr_pages);
52static int __add_section(struct zone *zone, unsigned long phys_start_pfn) 48static int __add_section(struct zone *zone, unsigned long phys_start_pfn)
53{ 49{
54 int nr_pages = PAGES_PER_SECTION; 50 int nr_pages = PAGES_PER_SECTION;