From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753843Ab0CHJoe (ORCPT ); Mon, 8 Mar 2010 04:44:34 -0500 Received: from sca-es-mail-1.Sun.COM ([192.18.43.132]:58524 "EHLO sca-es-mail-1.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753283Ab0CHJo1 (ORCPT ); Mon, 8 Mar 2010 04:44:27 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Date: Mon, 08 Mar 2010 01:43:24 -0800 From: Yinghai Lu Subject: [PATCH 4/4] x86: make e820 to be initdata In-reply-to: <1268041404-14029-1-git-send-email-yinghai@kernel.org> To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton Cc: linux-kernel@vger.kernel.org, Yinghai Lu Message-id: <1268041404-14029-5-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 References: <1268041404-14029-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org and we don't need to expose e820_any_mapped anymore Signed-off-by: Yinghai Lu --- arch/x86/kernel/e820.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6/arch/x86/kernel/e820.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/e820.c +++ linux-2.6/arch/x86/kernel/e820.c @@ -34,7 +34,7 @@ * user can e.g. boot the original kernel with mem=1G while still booting the * next kernel with full memory. */ -static struct e820map e820; +static struct e820map __initdata e820; static struct e820map __initdata e820_saved; /* For PCI or other memory-mapped resources */ @@ -46,9 +46,10 @@ EXPORT_SYMBOL(pci_mem_start); /* * This function checks if any part of the range is mapped * with type. + * phys_pud_init() is using it and is _meminit, but we have !after_bootmem + * so could use refok here */ -int -e820_any_mapped(u64 start, u64 end, unsigned type) +int __init_refok e820_any_mapped(u64 start, u64 end, unsigned type) { int i; @@ -63,7 +64,6 @@ e820_any_mapped(u64 start, u64 end, unsi } return 0; } -EXPORT_SYMBOL_GPL(e820_any_mapped); /* * This function checks if the entire range is mapped with type.