From 11cd0bc140b5d66566c9eb49c1058737888cd75c Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Mon, 23 Jun 2008 19:51:10 -0700 Subject: x86: move some func calling from setup_arch to paging_init those function depend on paging setup pgtable, so they could access the ram in bootmem region but just get mapped. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup_32.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) (limited to 'arch/x86/kernel') diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 1e670372c19..220d92faf0a 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -249,7 +249,7 @@ static void __init reserve_initrd(void) #define MAX_MAP_CHUNK (NR_FIX_BTMAPS << PAGE_SHIFT) -static void __init post_reserve_initrd(void) +void __init post_reserve_initrd(void) { u64 ramdisk_image = boot_params.hdr.ramdisk_image; u64 ramdisk_size = boot_params.hdr.ramdisk_size; @@ -307,29 +307,11 @@ static void __init post_reserve_initrd(void) void __init reserve_initrd(void) { } -static void __init post_reserve_initrd(void) +void __init post_reserve_initrd(void) { } #endif /* CONFIG_BLK_DEV_INITRD */ -/* - * The node 0 pgdat is initialized before all of these because - * it's needed for bootmem. node>0 pgdats have their virtual - * space allocated before the pagetables are in place to access - * them, so they can't be cleared then. - * - * This should all compile down to nothing when NUMA is off. - */ -static void __init remapped_pgdat_init(void) -{ - int nid; - - for_each_online_node(nid) { - if (nid != 0) - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); - } -} - #ifdef CONFIG_MCA static void set_mca_bus(int x) { @@ -524,18 +506,6 @@ void __init setup_arch(char **cmdline_p) init_ohci1394_dma_on_all_controllers(); #endif - /* - * NOTE: at this point the bootmem allocator is fully available. - */ - - post_reserve_initrd(); - - remapped_pgdat_init(); - sparse_init(); - zone_sizes_init(); - - paravirt_post_allocator_init(); - #ifdef CONFIG_X86_GENERICARCH generic_apic_probe(); #endif -- cgit v1.2.3-70-g09d2