From e7b3789524eecc96213dd69d6686efd429235051 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 25 Jun 2008 21:51:28 -0700 Subject: x86: move fix mapping page table range early do that in init_memory_mapping also remove one init_ohci1394_dma_on_all_controllers Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'arch/x86/kernel/setup.c') diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 161609c..bf528b2 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -611,11 +611,6 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_X86_32 probe_roms(); -#else -# ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT - if (init_ohci1394_dma_early) - init_ohci1394_dma_on_all_controllers(); -# endif #endif /* after parse_early_param, so could debug it */ @@ -672,6 +667,15 @@ void __init setup_arch(char **cmdline_p) /* max_pfn_mapped is updated here */ max_pfn_mapped = init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT)); + /* + * NOTE: On x86-32, only from this point on, fixmaps are ready for use. + */ + +#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT + if (init_ohci1394_dma_early) + init_ohci1394_dma_on_all_controllers(); +#endif + reserve_initrd(); #ifdef CONFIG_X86_64 @@ -739,15 +743,6 @@ void __init setup_arch(char **cmdline_p) map_vsyscall(); #endif - /* - * NOTE: On x86-32, only from this point on, fixmaps are ready for use. - */ - -#if defined(CONFIG_PROVIDE_OHCI1394_DMA_INIT) && defined(CONFIG_X86_32) - if (init_ohci1394_dma_early) - init_ohci1394_dma_on_all_controllers(); -#endif - #ifdef CONFIG_X86_GENERICARCH generic_apic_probe(); #endif -- cgit v1.1