From 27976b6ec2cddcc148febb2782c0f4c0289d3a51 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 20 Feb 2012 15:29:34 -0500 Subject: [PATCH] --- yaml --- r: 288021 b: refs/heads/master c: a38449ef596b345e13a8f9b7d5cd9fedb8fcf921 h: refs/heads/master i: 288019: 840a4a599846868d7e912579696929253eeb4f4b v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e19400e6587f..1af4d772ed44 100644 --- 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 index debd851de6ff..1333d9851778 100644 --- 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 /*