aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-25 21:51:28 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:16:01 +0200
commite7b3789524eecc96213dd69d6686efd429235051 (patch)
tree2d723f289663fdbbf49e967e50c1347f91e6d95f /arch/x86/kernel/setup.c
parent042623bbabae168246ad8a37693f0ecb6c450aea (diff)
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 <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 161609c6925..bf528b23750 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