Signed-off-by: juergen.gross@xxxxxxxxxxxxxx diff -r 668f71224241 xen/arch/x86/x86_32/entry.S --- a/xen/arch/x86/x86_32/entry.S Mon Aug 02 16:58:50 2010 +0100 +++ b/xen/arch/x86/x86_32/entry.S Thu Aug 05 06:56:06 2010 +0200 @@ -264,7 +264,7 @@ process_mce: ALIGN /* %ebx: struct vcpu */ process_nmi: - cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%ebx) + testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%ebx) jnz test_guest_events sti movb $0,VCPU_nmi_pending(%ebx) diff -r 668f71224241 xen/arch/x86/x86_64/compat/entry.S --- a/xen/arch/x86/x86_64/compat/entry.S Mon Aug 02 16:58:50 2010 +0100 +++ b/xen/arch/x86/x86_64/compat/entry.S Thu Aug 05 06:56:06 2010 +0200 @@ -137,7 +137,7 @@ compat_process_mce: ALIGN /* %rbx: struct vcpu */ compat_process_nmi: - cmpw $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx) + testb $1 << VCPU_TRAP_NMI,VCPU_async_exception_mask(%rbx) jnz compat_test_guest_events sti movb $0,VCPU_nmi_pending(%rbx) diff -r 668f71224241 xen/arch/x86/x86_64/entry.S --- a/xen/arch/x86/x86_64/entry.S Mon Aug 02 16:58:50 2010 +0100 +++ b/xen/arch/x86/x86_64/entry.S Thu Aug 05 06:56:06 2010 +0200 @@ -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)