Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / arch / x86 / kernel / head_64.S

diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 33f36c78594e49d15867165f3a57b37336874cd7..a468c0a65c42e00df4e10afd9921d81a53dbba3d 100644 (file)
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -343,7 +343,7 @@ early_idt_handlers:
 ENTRY(early_idt_handler)
        cld
 
-       cmpl $X86_TRAP_NMI,(%rsp)
+       cmpl $2,(%rsp)          # X86_TRAP_NMI
        je is_nmi               # Ignore NMI
 
        cmpl $2,early_recursion_flag(%rip)