From patchwork Mon Jan 4 03:05:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 70558 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o043AjA9012406 for ; Mon, 4 Jan 2010 03:10:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753176Ab0ADDIw (ORCPT ); Sun, 3 Jan 2010 22:08:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753230Ab0ADDIv (ORCPT ); Sun, 3 Jan 2010 22:08:51 -0500 Received: from sca-es-mail-2.Sun.COM ([192.18.43.133]:56504 "EHLO sca-es-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176Ab0ADDHe (ORCPT ); Sun, 3 Jan 2010 22:07:34 -0500 Received: from fe-sfbay-10.sun.com ([192.18.43.129]) by sca-es-mail-2.sun.com (8.13.7+Sun/8.12.9) with ESMTP id o0437YSU005171; Sun, 3 Jan 2010 19:07:34 -0800 (PST) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.fe-sfbay-10.sun.com by fe-sfbay-10.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) id <0KVP00500CK5PO00@fe-sfbay-10.sun.com>; Sun, 03 Jan 2010 19:07:34 -0800 (PST) Received: from localhost.localdomain ([unknown] [75.55.223.240]) by fe-sfbay-10.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KVP00DJECNOX4E0@fe-sfbay-10.sun.com>; Sun, 03 Jan 2010 19:07:32 -0800 (PST) Date: Sun, 03 Jan 2010 19:05:04 -0800 From: Yinghai Lu Subject: [PATCH 26/29] x86: make 32bit support NO_BOOTMEM In-reply-to: <1262574307-17040-1-git-send-email-yinghai@kernel.org> To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , Jesse Barnes , Christoph Lameter Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Message-id: <1262574307-17040-27-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 References: <1262574307-17040-1-git-send-email-yinghai@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ffb025c..8f9e065 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -570,7 +570,6 @@ config PARAVIRT_DEBUG config NO_BOOTMEM default y bool "Disable Bootmem code" - depends on X86_64 ---help--- use early_res directly instead of bootmem before slab is ready. diff --git a/arch/x86/kernel/early_res.c b/arch/x86/kernel/early_res.c index 52804e9..38a0c61 100644 --- a/arch/x86/kernel/early_res.c +++ b/arch/x86/kernel/early_res.c @@ -354,6 +354,9 @@ int __init get_free_all_memory_range(struct range **rangep, int nodeid) /* need to go over early_node_map to find out good range for node */ nr_range = add_from_early_node_map(range, count, nr_range, nodeid); +#ifdef CONFIG_X86_32 + subtract_range(range, count, max_low_pfn, -1UL); +#endif subtract_early_res(range, count); nr_range = clean_sort_range(range, count); diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 3c4fe2a..033eb18 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -748,6 +748,7 @@ static void __init zone_sizes_init(void) free_area_init_nodes(max_zone_pfns); } +#ifndef CONFIG_NO_BOOTMEM static unsigned long __init setup_node_bootmem(int nodeid, unsigned long start_pfn, unsigned long end_pfn, @@ -767,9 +768,11 @@ static unsigned long __init setup_node_bootmem(int nodeid, return bootmap + bootmap_size; } +#endif void __init setup_bootmem_allocator(void) { +#ifndef CONFIG_NO_BOOTMEM int nodeid; unsigned long bootmap_size, bootmap; /* @@ -781,11 +784,13 @@ void __init setup_bootmem_allocator(void) if (bootmap == -1L) panic("Cannot find bootmem map of size %ld\n", bootmap_size); reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP"); +#endif printk(KERN_INFO " mapped low ram: 0 - %08lx\n", max_pfn_mapped<node_id = nid; +#ifndef CONFIG_NO_BOOTMEM NODE_DATA(nid)->bdata = &bootmem_node_data[nid]; +#endif } setup_bootmem_allocator();