Fix crash with FLAT_MEMORY and ARCH_PFN_OFFSET != 0

[~andy/linux] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d73bfad1c32f2e2254aaa1f47de3bda7db0b8b88..e1028fae3ebbd2644628316cc08f94fa55ae0dad 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3438,7 +3438,7 @@ static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat)
                mem_map = NODE_DATA(0)->node_mem_map;
 #ifdef CONFIG_ARCH_POPULATES_NODE_MAP
                if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
-                       mem_map -= pgdat->node_start_pfn;
+                       mem_map -= (pgdat->node_start_pfn - ARCH_PFN_OFFSET);
 #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
        }
 #endif