aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/x86_64/entry.S
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-08-05 14:41:14 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-08-05 14:41:14 +0100
commite0a4694418b057255352094571d7b59a2cbc4c8b (patch)
tree957f191f70d8edd9894dc4f38411e99220c635a5 /xen/arch/x86/x86_64/entry.S
parent4cc1d7b7fa6e03e9775212930d10ea22cd3353d4 (diff)
downloadxen-e0a4694418b057255352094571d7b59a2cbc4c8b.tar.gz
xen-e0a4694418b057255352094571d7b59a2cbc4c8b.tar.bz2
xen-e0a4694418b057255352094571d7b59a2cbc4c8b.zip
x86: Fix NMI injection to PV guests
Signed-off-by: Juergen Gross <juergen.gross@ts.fujitsu.com>
Diffstat (limited to 'xen/arch/x86/x86_64/entry.S')
-rw-r--r--xen/arch/x86/x86_64/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 8bb3e228c1..05290484ec 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -239,7 +239,7 @@ process_mce:
ALIGN
/* %rbx: struct vcpu */
process_nmi:
- cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx)
+ testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx)
jnz test_guest_events
sti
movb $0,VCPU_nmi_pending(%rbx)