---

yaml --- r: 288020 b: refs/heads/master c: 45d5a16 h: refs/heads/master v: v3
git-mirror · Feb 20, 2012 · 1067693 · 1067693
1 parent 840a4a5
commit 1067693
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c3233885eb10ac9cb9410f2f8cd64b8df2b2a1
+refs/heads/master: 45d5a1683c04be28abdf5c04c27b1417e0374486
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
@@ -1531,6 +1531,13 @@ ENTRY(nmi)
 	/* Use %rdx as out temp variable throughout */
 	pushq_cfi %rdx
 
+	/*
+	 * If %cs was not the kernel segment, then the NMI triggered in user
+	 * space, which means it is definitely not nested.
+	 */
+	cmp $__KERNEL_CS, 16(%rsp)
+	jne first_nmi
+
 	/*
 	 * Check the special variable on the stack to see if NMIs are
 	 * executing.