mm-page_allocc-introduce-kernelcore=mirror-option-fix

fix build with CONFIG_HAVE_MEMBLOCK_NODE_MAP=n

Reported-by: Sudeep Holla <sudeep.holla@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 45d6f658b7ac2c1c3bd5b5a7dc1d101eddb2ed64..b8160b9d5e7255b2a40773cf3b72bf2de8da7317 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4521,6 +4521,7 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                                                &nr_initialised))
                                break;
 
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
                        /*
                         * if not mirrored_kernelcore and ZONE_MOVABLE exists,
                         * range from zone_movable_pfn[nid] to end of each node
@@ -4531,7 +4532,6 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                                    pfn >= zone_movable_pfn[nid])
                                        continue;
 
-#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
                        /*
                         * check given memblock attribute by firmware which
                         * can affect kernel memory layout.