aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memory_hotplug.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/memory_hotplug.h')
-rw-r--r--include/linux/memory_hotplug.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index ffd9cd10fcf3..07da5c6c5ba0 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -107,8 +107,8 @@ static inline bool movable_node_is_enabled(void)
107} 107}
108 108
109#ifdef CONFIG_MEMORY_HOTREMOVE 109#ifdef CONFIG_MEMORY_HOTREMOVE
110extern int arch_remove_memory(u64 start, u64 size, 110extern int arch_remove_memory(int nid, u64 start, u64 size,
111 struct vmem_altmap *altmap); 111 struct vmem_altmap *altmap);
112extern int __remove_pages(struct zone *zone, unsigned long start_pfn, 112extern int __remove_pages(struct zone *zone, unsigned long start_pfn,
113 unsigned long nr_pages, struct vmem_altmap *altmap); 113 unsigned long nr_pages, struct vmem_altmap *altmap);
114#endif /* CONFIG_MEMORY_HOTREMOVE */ 114#endif /* CONFIG_MEMORY_HOTREMOVE */
@@ -326,15 +326,14 @@ extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
326 void *arg, int (*func)(struct memory_block *, void *)); 326 void *arg, int (*func)(struct memory_block *, void *));
327extern int __add_memory(int nid, u64 start, u64 size); 327extern int __add_memory(int nid, u64 start, u64 size);
328extern int add_memory(int nid, u64 start, u64 size); 328extern int add_memory(int nid, u64 start, u64 size);
329extern int add_memory_resource(int nid, struct resource *resource, bool online); 329extern int add_memory_resource(int nid, struct resource *resource);
330extern int arch_add_memory(int nid, u64 start, u64 size, 330extern int arch_add_memory(int nid, u64 start, u64 size,
331 struct vmem_altmap *altmap, bool want_memblock); 331 struct vmem_altmap *altmap, bool want_memblock);
332extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, 332extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
333 unsigned long nr_pages, struct vmem_altmap *altmap); 333 unsigned long nr_pages, struct vmem_altmap *altmap);
334extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
335extern bool is_memblock_offlined(struct memory_block *mem); 334extern bool is_memblock_offlined(struct memory_block *mem);
336extern int sparse_add_one_section(struct pglist_data *pgdat, 335extern int sparse_add_one_section(int nid, unsigned long start_pfn,
337 unsigned long start_pfn, struct vmem_altmap *altmap); 336 struct vmem_altmap *altmap);
338extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, 337extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms,
339 unsigned long map_offset, struct vmem_altmap *altmap); 338 unsigned long map_offset, struct vmem_altmap *altmap);
340extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, 339extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map,