From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755522AbXLRMFj (ORCPT ); Tue, 18 Dec 2007 07:05:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753624AbXLRMFa (ORCPT ); Tue, 18 Dec 2007 07:05:30 -0500 Received: from elvis.franken.de ([193.175.24.41]:40249 "EHLO elvis.franken.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752963AbXLRMFa (ORCPT ); Tue, 18 Dec 2007 07:05:30 -0500 From: Thomas Bogendoerfer To: linux-kernel@vger.kernel.org Cc: Mel Gorman , Bob Picco , Dave Hansen , Andy Whitcroft , Andi Kleen , Benjamin Herrenschmidt , Paul Mackerras , "Keith Mannthey" , "Luck, Tony" , KAMEZAWA Hiroyuki , Yasunori Goto , akpm@linux-foundation.org, Linus Torvalds Subject: [PATCH] Fix crash with FLAT_MEMORY and ARCH_PFN_OFFSET != 0 Message-Id: <20071218120300.7565AE3030@solo.franken.de> Date: Tue, 18 Dec 2007 13:03:00 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- mm/page_alloc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b5a58d4..496f7f3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3427,7 +3427,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