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

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

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index d2a21590794a868456f9f49ae41d28d5d7954de7..f36bd42d6f0c8b5fc5cd75dcf133b35a1f6bfe3b 100644 (file)
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -545,7 +545,7 @@ ENDPROC(early_idt_handlers)
 ENTRY(early_idt_handler)
        cld
 
-       cmpl $X86_TRAP_NMI,(%esp)
+       cmpl $2,(%esp)          # X86_TRAP_NMI
        je is_nmi               # Ignore NMI
 
        cmpl $2,%ss:early_recursion_flag