[PATCH 3/5] xen: deal with NMI's use of IST too

[Jeremy Fitzhardinge <jeremy@goop.org>]

NMI uses the IST, and Xen will also deal with it.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
 arch/x86/xen/enlighten.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 88f3aa4..b88ecc3 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -451,7 +451,8 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val,
 	else if (addr == (unsigned long)int3)
 		addr = (unsigned long)xen_int3;
 	else if (addr == (unsigned long)double_fault ||
-		 addr == (unsigned long)stack_segment) {
+		 addr == (unsigned long)stack_segment ||
+		 addr == (unsigned long)nmi) {
 		/* Don't need to handle these */
 		return 0;
 #ifdef CONFIG_X86_MCE
-- 
1.6.0.6