Messages in this thread Patch in this message | | | Date | Wed, 10 Mar 2010 13:24:25 -0800 | From | Yinghai Lu <> | Subject | [PATCH 4/4] x86: make e820 to be initdata |
| |
and we don't need to expose e820_any_mapped anymore
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
--- 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 <start,end> 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 <start,end> is mapped with type.
| |