2 files changed, 3 insertions, 5 deletions

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 48be76cda93b..d6d54faa84df 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -127,7 +127,7 @@ void __init x86_64_start_kernel(char * real_mode_data)
         /* Cleanup the over mapped high alias */
         cleanup_highmap();
 
-        for (i = 0; i < IDT_ENTRIES; i++) {
+        for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) {
 #ifdef CONFIG_EARLY_PRINTK
                 set_intr_gate(i, &early_idt_handlers[i]);
 #else
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 017216916dff..2c0abe0e3c68 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -278,10 +278,8 @@ bad_address:
 
         .globl early_idt_handlers
 early_idt_handlers:
-        early_idt_tramp 0, 63
-        early_idt_tramp 64, 127
-        early_idt_tramp 128, 191
-        early_idt_tramp 192, 255
+        .set maxe, NUM_EXCEPTION_VECTORS-1
+        early_idt_tramp 0, maxe
 #endif
 
 ENTRY(early_idt_handler)