From: Lin Feng Date: Thu, 7 Feb 2013 01:26:25 +0000 (+1100) Subject: memory-hotplug: introduce CONFIG_HAVE_BOOTMEM_INFO_NODE and revert register_page_boot... X-Git-Tag: next-20130218~1^2~458 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3efb2e7d3d5b983d3c5e59bff36621304490e125;p=karo-tx-linux.git memory-hotplug: introduce CONFIG_HAVE_BOOTMEM_INFO_NODE and revert register_page_bootmem_info_node() when platform not support It's implemented by adding a new Kconfig option named CONFIG_HAVE_BOOTMEM_INFO_NODE, which will be automatically selected by memory-hotplug feature fully supported archs(currently only on x86_64). Signed-off-by: Lin Feng Reported-by: Michal Hocko Signed-off-by: Andrew Morton --- diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 5d3e8fa2801a..f17aa76dc1ae 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1034,7 +1034,7 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) return 0; } -#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE +#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE) void register_page_bootmem_memmap(unsigned long section_nr, struct page *start_page, unsigned long size) { diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 2441f36b7ccc..4d523fe75ba1 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -174,7 +174,13 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) #endif /* CONFIG_NUMA */ #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ +#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE extern void register_page_bootmem_info_node(struct pglist_data *pgdat); +#else +static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) +{ +} +#endif extern void put_page_bootmem(struct page *page); extern void get_page_bootmem(unsigned long ingo, struct page *page, unsigned long type); diff --git a/mm/Kconfig b/mm/Kconfig index 308fdcaeed77..a394ab027451 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -162,10 +162,18 @@ config MOVABLE_NODE Say Y here if you want to hotplug a whole node. Say N here if you want kernel to use memory on all nodes evenly. +# +# Only be set on architectures that have completely implemented memory hotplug +# feature. If you are not sure, don't touch it. +# +config HAVE_BOOTMEM_INFO_NODE + def_bool n + # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" select MEMORY_ISOLATION + select HAVE_BOOTMEM_INFO_NODE if X86_64 depends on SPARSEMEM || X86_64_ACPI_NUMA depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index e09282de4857..a15f082668a2 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -188,6 +188,7 @@ static void register_page_bootmem_info_section(unsigned long start_pfn) } #endif +#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE void register_page_bootmem_info_node(struct pglist_data *pgdat) { unsigned long i, pfn, end_pfn, nr_pages; @@ -229,6 +230,7 @@ void register_page_bootmem_info_node(struct pglist_data *pgdat) register_page_bootmem_info_section(pfn); } } +#endif static void grow_zone_span(struct zone *zone, unsigned long start_pfn, unsigned long end_pfn)