---

yaml --- r: 99808 b: refs/heads/master c: 6c8decd h: refs/heads/master v: v3
git-mirror · May 25, 2008 · 4dc4052 · 4dc4052
1 parent f689e2e
commit 4dc4052
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad63ba169d45ccb6594eb35a6c31c421fe70ff45
+refs/heads/master: 6c8decdf14b17d42f6eb817d310642f4d6598a19
diff --git a/trunk/arch/x86/kernel/nmi_32.c b/trunk/arch/x86/kernel/nmi_32.c
@@ -425,7 +425,7 @@ static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu)
 	char buf[64];
 
 	sprintf(buf, "NMI received for unknown reason %02x\n", reason);
-	die_nmi(buf, regs, 0);
+	die_nmi(buf, regs, 1); /* Always panic here */
 	return 0;
 }