2 files changed, 15 insertions, 3 deletions

diff --git a/include/asm-x86_64/hw_irq.h b/include/asm-x86_64/hw_irq.h
index d9212eb4e894..dc97668ea0f9 100644
--- a/include/asm-x86_64/hw_irq.h
+++ b/include/asm-x86_64/hw_irq.h
@@ -26,6 +26,7 @@
 struct hw_interrupt_type;
 #endif
 
+#define NMI_VECTOR              0x02
 /*
  * IDT vectors usable for external interrupt sources start
  * at 0x20:
diff --git a/include/asm-x86_64/ipi.h b/include/asm-x86_64/ipi.h
index 7ba668f43c59..022e9d340ad7 100644
--- a/include/asm-x86_64/ipi.h
+++ b/include/asm-x86_64/ipi.h
@@ -31,9 +31,20 @@
 
 static inline unsigned int __prepare_ICR (unsigned int shortcut, int vector, unsigned int dest)
 {
-        unsigned int icr =  APIC_DM_FIXED | shortcut | vector | dest;
-        if (vector == KDB_VECTOR)
-                icr = (icr & (~APIC_VECTOR_MASK)) | APIC_DM_NMI;
+        unsigned int icr = shortcut | dest;
+
+        switch (vector) {
+        default:
+                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;
+        }
         return icr;
 }