x86: restrict keyboard io ports reservation to make ipmi driver work

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / head_64.S

diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 2c0abe0e3c687b5200dc01e4c9b98689938f8822..10a1955bb1d17df7f90bff735ae733b648f58c15 100644 (file)
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -132,10 +132,6 @@ ident_complete:
        addq    %rbp, trampoline_level4_pgt + 0(%rip)
        addq    %rbp, trampoline_level4_pgt + (511*8)(%rip)
 #endif
-#ifdef CONFIG_ACPI_SLEEP
-       addq    %rbp, wakeup_level4_pgt + 0(%rip)
-       addq    %rbp, wakeup_level4_pgt + (511*8)(%rip)
-#endif
 
        /* Due to ENTRY(), sometimes the empty space gets filled with
         * zeros. Better take a jmp than relying on empty space being
@@ -267,19 +263,16 @@ ENTRY(secondary_startup_64)
 bad_address:
        jmp bad_address
 
+       .section ".init.text","ax"
 #ifdef CONFIG_EARLY_PRINTK
-.macro early_idt_tramp first, last
-       .ifgt \last-\first
-       early_idt_tramp \first, \last-1
-       .endif
-       movl $\last,%esi
-       jmp early_idt_handler
-.endm
-
        .globl early_idt_handlers
 early_idt_handlers:
-       .set maxe, NUM_EXCEPTION_VECTORS-1
-       early_idt_tramp 0, maxe
+       i = 0
+       .rept NUM_EXCEPTION_VECTORS
+       movl $i, %esi
+       jmp early_idt_handler
+       i = i + 1
+       .endr
 #endif
 
 ENTRY(early_idt_handler)
@@ -325,6 +318,7 @@ early_idt_msg:
 early_idt_ripmsg:
        .asciz "RIP %s\n"
 #endif /* CONFIG_EARLY_PRINTK */
+       .previous
 
 .balign PAGE_SIZE