[PATCH] x86_64: Remove useless KDB vector

It was set as an NMI, but the NMI bit always forces an interrupt
to end up at vector 2. So it was never used. Remove.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6 files changed, 3 insertions, 22 deletions

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 300555bc56..632fc0f59f 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -1040,9 +1040,6 @@ ENTRY(machine_check)
         CFI_ENDPROC
 #endif
 
-ENTRY(call_debug)
-       zeroentry do_call_debug
-
 ENTRY(call_softirq)
         CFI_STARTPROC
         movq %gs:pda_irqstackptr,%rax
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index 6e5101ad3d..b61965f0fb 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -549,10 +549,9 @@ void __init init_IRQ(void)
                 int vector = FIRST_EXTERNAL_VECTOR + i;
                 if (i >= NR_IRQS)
                         break;
-                if (vector != IA32_SYSCALL_VECTOR && vector != KDB_VECTOR) { 
+                if (vector != IA32_SYSCALL_VECTOR)
                         set_intr_gate(vector, interrupt[i]);
         }
-        }
 
 #ifdef CONFIG_SMP
         /*
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 6a666d248c..19ef012b1f 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -281,11 +281,6 @@ void flush_tlb_all(void)
         on_each_cpu(do_flush_tlb_all, NULL, 1, 1);
 }
 
-void smp_kdb_stop(void)
-{
-        send_IPI_allbutself(KDB_VECTOR);
-}
-
 /*
  * this function sends a 'reschedule' IPI to another CPU.
  * it goes straight through and wastes no time serializing
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 0827b141c0..5dee23ba07 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -910,11 +910,6 @@ asmlinkage void math_state_restore(void)
         me->thread_info->status |= TS_USEDFPU;
 }
 
-void do_call_debug(struct pt_regs *regs) 
-{ 
-        notify_die(DIE_CALL, "debug call", regs, 0, 255, SIGINT); 
-}
-
 void __init trap_init(void)
 {
         set_intr_gate(0,&divide_error);
@@ -944,8 +939,6 @@ void __init trap_init(void)
         set_system_gate(IA32_SYSCALL_VECTOR, ia32_syscall);
 #endif
        
-        set_intr_gate(KDB_VECTOR, call_debug);
-       
         /*
          * Should be a barrier for any external CPU state.
          */
diff --git a/include/asm-x86_64/hw_irq.h b/include/asm-x86_64/hw_irq.h
index b248930767..0df1715dee 100644
--- a/include/asm-x86_64/hw_irq.h
+++ b/include/asm-x86_64/hw_irq.h
@@ -51,7 +51,8 @@ struct hw_interrupt_type;
 #define ERROR_APIC_VECTOR       0xfe
 #define RESCHEDULE_VECTOR       0xfd
 #define CALL_FUNCTION_VECTOR    0xfc
-#define KDB_VECTOR              0xfb    /* reserved for KDB */
+/* fb free - please don't readd KDB here because it's useless
+   (hint - think what a NMI bit does to a vector) */
 #define THERMAL_APIC_VECTOR     0xfa
 #define THRESHOLD_APIC_VECTOR   0xf9
 /* f8 free */
diff --git a/include/asm-x86_64/ipi.h b/include/asm-x86_64/ipi.h
index 022e9d340a..2a5c162b7d 100644
--- a/include/asm-x86_64/ipi.h
+++ b/include/asm-x86_64/ipi.h
@@ -38,10 +38,6 @@ static inline unsigned int __prepare_ICR (unsigned int shortcut, int vector, uns
                 icr |= APIC_DM_FIXED | vector;
                 break;
         case NMI_VECTOR:
-                /*
-                 * Setup KDB IPI to be delivered as an NMI
-                 */
-        case KDB_VECTOR:
                 icr |= APIC_DM_NMI;
                 break;
         }