From: Michal Hocko Date: Wed, 20 Feb 2013 02:14:13 +0000 (+1100) Subject: memory-hotplug-implement-register_page_bootmem_info_section-of-sparse-vmemmap-fix X-Git-Tag: next-20130220~1^2~547 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96d64319fa3fd03e3e81eb92f1794af7512c1134;p=karo-tx-linux.git memory-hotplug-implement-register_page_bootmem_info_section-of-sparse-vmemmap-fix put register_page_bootmem_memmap inside CONFIG_MEMORY_HOTPLUG_SPARSE Signed-off-by: Michal Hocko Tested-by: Lin Feng Signed-off-by: Andrew Morton --- diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 44d19062cd7b..5d3e8fa2801a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1034,6 +1034,7 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) return 0; } +#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE void register_page_bootmem_memmap(unsigned long section_nr, struct page *start_page, unsigned long size) { @@ -1091,6 +1092,7 @@ void register_page_bootmem_memmap(unsigned long section_nr, } } } +#endif void __meminit vmemmap_populate_print_last(void) {