From 32d9166d700673491855a0a2d65ed44fc33b8533 Mon Sep 17 00:00:00 2001
From: Corey Minyard <minyard@acm.org>
Date: Mon, 8 May 2006 15:17:25 +0200
Subject: [PATCH] --- yaml --- r: 26560 b: refs/heads/master c:
 8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/traps.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ba015cc9e571..e778143dcdc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe
+refs/heads/master: 8b1ffe9550e71224c43d8c754245bd76f4ea9bb8
diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c
index 0ebb281aa178..6b87268c5c2e 100644
--- a/trunk/arch/x86_64/kernel/traps.c
+++ b/trunk/arch/x86_64/kernel/traps.c
@@ -472,6 +472,8 @@ void __kprobes die_nmi(char *str, struct pt_regs *regs)
 		panic("nmi watchdog");
 	printk("console shuts up ...\n");
 	oops_end(flags);
+	nmi_exit();
+	local_irq_enable();
 	do_exit(SIGSEGV);
 }