---

yaml --- r: 288021 b: refs/heads/master c: a38449e h: refs/heads/master i: 288019: 840a4a5 v: v3
git-mirror · Feb 21, 2012 · 27976b6 · 27976b6
1 parent 1067693
commit 27976b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45d5a1683c04be28abdf5c04c27b1417e0374486
+refs/heads/master: a38449ef596b345e13a8f9b7d5cd9fedb8fcf921
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
@@ -1535,14 +1535,14 @@ ENTRY(nmi)
 	 * 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)
+	cmpl $__KERNEL_CS, 16(%rsp)
 	jne first_nmi
 
 	/*
 	 * Check the special variable on the stack to see if NMIs are
 	 * executing.
 	 */
-	cmp $1, -8(%rsp)
+	cmpl $1, -8(%rsp)
 	je nested_nmi
 
 	/*