From 046648af1bb75981cedf5a8cc88bccc5a229d88c Mon Sep 17 00:00:00 2001 From: Thomas Bogendoerfer Date: Tue, 8 Jan 2008 15:33:11 -0800 Subject: [PATCH] --- yaml --- r: 75308 b: refs/heads/master c: 467bc461d2845f6a04b124bca1ae6ecc554e1ee5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 76deaeb03f14..33aaffe2250c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22a860a9e22fa077300e1e72170afb82bf695617 +refs/heads/master: 467bc461d2845f6a04b124bca1ae6ecc554e1ee5 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index d73bfad1c32f..e1028fae3ebb 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/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