From e93aff88f7746805e1e815c3539371c161dd5360 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Wed, 20 Feb 2013 13:14:22 +1100 Subject: [PATCH] memory-hotplug: export the function try_offline_node() fix "memory-hotplug: export the function try_offline_node()" declares try_offline_node() for CONFIG_MEMORY_HOTPLUG, but this function is only defined for CONFIG_MEMORY_HOTREMOVE: ERROR: "try_offline_node" [drivers/acpi/processor.ko] undefined! Fix the build by definining it appropriately. Signed-off-by: David Rientjes Cc: Wen Congyang Cc: Tang Chen Cc: Yasuaki Ishimatsu Signed-off-by: Andrew Morton --- include/linux/memory_hotplug.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 0b2878e34d1e..b6a3be7d47bf 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -193,7 +193,6 @@ extern void get_page_bootmem(unsigned long ingo, struct page *page, void lock_memory_hotplug(void); void unlock_memory_hotplug(void); -extern void try_offline_node(int nid); #else /* ! CONFIG_MEMORY_HOTPLUG */ /* @@ -228,13 +227,13 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) static inline void lock_memory_hotplug(void) {} static inline void unlock_memory_hotplug(void) {} -static inline void try_offline_node(int nid) {} #endif /* ! CONFIG_MEMORY_HOTPLUG */ #ifdef CONFIG_MEMORY_HOTREMOVE extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages); +extern void try_offline_node(int nid); #else static inline int is_mem_section_removable(unsigned long pfn, @@ -242,6 +241,8 @@ static inline int is_mem_section_removable(unsigned long pfn, { return 0; } + +static inline void try_offline_node(int nid) {} #endif /* CONFIG_MEMORY_HOTREMOVE */ extern int mem_online_node(int nid); -- 2.39.5