Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 022ebddb3734e6cdf528f47393c62195b29a0834..9cc16a8417459427f330101578e23f6234dabadd 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -900,7 +900,7 @@ void __init setup_arch(char **cmdline_p)
         */
        olpc_ofw_detect();
 
-       early_trap_init();
+       idt_setup_early_traps();
        early_cpu_init();
        early_ioremap_init();
 
@@ -1171,7 +1171,7 @@ void __init setup_arch(char **cmdline_p)
 
        init_mem_mapping();
 
-       early_trap_pf_init();
+       idt_setup_early_pf();
 
        /*
         * Update mmu_cr4_features (and, indirectly, trampoline_cr4_features)