aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/memory_hotplug.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 911206386171..29c1472efad0 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -63,6 +63,16 @@ extern int online_pages(unsigned long, unsigned long);
63/* reasonably generic interface to expand the physical pages in a zone */ 63/* reasonably generic interface to expand the physical pages in a zone */
64extern int __add_pages(struct zone *zone, unsigned long start_pfn, 64extern int __add_pages(struct zone *zone, unsigned long start_pfn,
65 unsigned long nr_pages); 65 unsigned long nr_pages);
66
67#ifdef CONFIG_NUMA
68extern int memory_add_physaddr_to_nid(u64 start);
69#else
70static inline int memory_add_physaddr_to_nid(u64 start)
71{
72 return 0;
73}
74#endif
75
66#else /* ! CONFIG_MEMORY_HOTPLUG */ 76#else /* ! CONFIG_MEMORY_HOTPLUG */
67/* 77/*
68 * Stub functions for when hotplug is off 78 * Stub functions for when hotplug is off
@@ -99,7 +109,8 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
99 return -ENOSYS; 109 return -ENOSYS;
100} 110}
101 111
102extern int add_memory(u64 start, u64 size); 112extern int add_memory(int nid, u64 start, u64 size);
113extern int arch_add_memory(int nid, u64 start, u64 size);
103extern int remove_memory(u64 start, u64 size); 114extern int remove_memory(u64 start, u64 size);
104 115
105#endif /* __LINUX_MEMORY_HOTPLUG_H */ 116#endif /* __LINUX_MEMORY_HOTPLUG_H */