Merge branch 'x86/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-beck.git] / arch / x86 / kernel / head64.c

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 3ff35705fa6e497fcf0171b7a1348ed8ce15ba97..c5e403f6d869e284c5e8c21785954b5d7e99d511 100644 (file)
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -160,13 +160,8 @@ void __init x86_64_start_kernel(char * real_mode_data)
        /* clear bss before set_intr_gate with early_idt_handler */
        clear_bss();
 
-       for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) {
-#ifdef CONFIG_EARLY_PRINTK
+       for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
                set_intr_gate(i, &early_idt_handlers[i]);
-#else
-               set_intr_gate(i, early_idt_handler);
-#endif
-       }
        load_idt((const struct desc_ptr *)&idt_descr);
 
        copy_bootdata(__va(real_mode_data));