Merge branch 'x86/spinlocks' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[karo-tx-linux.git] / arch / x86 / xen / smp.c

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 3b52d8075e47b6572accbc0b6dd741d9d403de2f..368c290929fe851b5426d4dff140b98986617cc9 100644 (file)
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -573,6 +573,12 @@ static inline int xen_map_vector(int vector)
        case IRQ_WORK_VECTOR:
                xen_vector = XEN_IRQ_WORK_VECTOR;
                break;
+#ifdef CONFIG_X86_64
+       case NMI_VECTOR:
+       case APIC_DM_NMI: /* Some use that instead of NMI_VECTOR */
+               xen_vector = XEN_NMI_VECTOR;
+               break;
+#endif
        default:
                xen_vector = -1;
                printk(KERN_ERR "xen: vector 0x%x is not implemented\n",