[PATCH] i386: handle NMI case in IPI sending

["Jan Beulich" <JBeulich@novell.com>]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

Define NMI_VECTOR for all sub-architectures, and handle it in the IPI
sending code.

From: Jan Beulich <jbeulich@novell.com>

(actual patch attached)


[-- Attachment #2: linux-2.6.14-i386-nmi-ipi.patch --]
[-- Type: application/octet-stream, Size: 1852 bytes --]

Define NMI_VECTOR for all sub-architectures, and handle it in the IPI
sending code.

From: Jan Beulich <jbeulich@novell.com>

--- 2.6.14/arch/i386/kernel/smp.c	2005-10-28 02:02:08.000000000 +0200
+++ 2.6.14-i386-nmi-ipi/arch/i386/kernel/smp.c	2005-11-04 16:51:14.000000000 +0100
@@ -114,7 +114,17 @@ DEFINE_PER_CPU(struct tlb_state, cpu_tlb
 
 static inline int __prepare_ICR (unsigned int shortcut, int vector)
 {
-	return APIC_DM_FIXED | shortcut | vector | APIC_DEST_LOGICAL;
+	unsigned int cfg = shortcut | vector | APIC_DEST_LOGICAL;
+
+	switch (vector) {
+	default:
+		cfg |= APIC_DM_FIXED;
+		break;
+	case NMI_VECTOR:
+		cfg |= APIC_DM_NMI;
+		break;
+	}
+	return cfg;
 }
 
 static inline int __prepare_ICR2 (unsigned int mask)
--- 2.6.14/include/asm-i386/mach-default/irq_vectors.h	2005-10-28 02:02:08.000000000 +0200
+++ 2.6.14-i386-nmi-ipi/include/asm-i386/mach-default/irq_vectors.h	2005-11-04 16:19:34.000000000 +0100
@@ -22,6 +22,7 @@
 #ifndef _ASM_IRQ_VECTORS_H
 #define _ASM_IRQ_VECTORS_H
 
+#define NMI_VECTOR		0x02
 /*
  * IDT vectors usable for external interrupt sources start
  * at 0x20:
--- 2.6.14/include/asm-i386/mach-visws/irq_vectors.h	2005-10-28 02:02:08.000000000 +0200
+++ 2.6.14-i386-nmi-ipi/include/asm-i386/mach-visws/irq_vectors.h	2005-11-04 16:19:34.000000000 +0100
@@ -1,6 +1,7 @@
 #ifndef _ASM_IRQ_VECTORS_H
 #define _ASM_IRQ_VECTORS_H
 
+#define NMI_VECTOR		0x02
 /*
  * IDT vectors usable for external interrupt sources start
  * at 0x20:
--- 2.6.14/include/asm-i386/mach-voyager/irq_vectors.h	2005-10-28 02:02:08.000000000 +0200
+++ 2.6.14-i386-nmi-ipi/include/asm-i386/mach-voyager/irq_vectors.h	2005-11-04 16:19:34.000000000 +0100
@@ -12,6 +12,7 @@
 #ifndef _ASM_IRQ_VECTORS_H
 #define _ASM_IRQ_VECTORS_H
 
+#define NMI_VECTOR		0x02
 /*
  * IDT vectors usable for external interrupt sources start
  * at 0x20: