Fix crash with FLAT_MEMORY and ARCH_PFN_OFFSET != 0

When using FLAT_MEMORY and ARCH_PFN_OFFSET is not 0, the kernel crashes in
memmap_init_zone(). This bug got introduced by commit
c713216deebd95d2b0ab38fef8bb2361c0180c2d

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Cc: Bob Picco <bob.picco@hp.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Keith Mannthey" <kmannth@gmail.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Thomas Bogendoerfer and committed by Linus Torvalds 467bc461 22a860a9

+1 -1
+1 -1
mm/page_alloc.c
··· 3438 mem_map = NODE_DATA(0)->node_mem_map; 3439 #ifdef CONFIG_ARCH_POPULATES_NODE_MAP 3440 if (page_to_pfn(mem_map) != pgdat->node_start_pfn) 3441 - mem_map -= pgdat->node_start_pfn; 3442 #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */ 3443 } 3444 #endif
··· 3438 mem_map = NODE_DATA(0)->node_mem_map; 3439 #ifdef CONFIG_ARCH_POPULATES_NODE_MAP 3440 if (page_to_pfn(mem_map) != pgdat->node_start_pfn) 3441 + mem_map -= (pgdat->node_start_pfn - ARCH_PFN_OFFSET); 3442 #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */ 3443 } 3444 #endif