x86: fix compile error due to X86_TRAP_NMI use in asm files

It's an enum, not a #define, you can't use it in asm files.

Introduced in commit 5fa10196bdb5 ("x86: Ignore NMIs that come in during
early boot"), and sadly I didn't compile-test things like I should have
before pushing out.

My weak excuse is that the x86 tree generally doesn't introduce stupid
things like this (and the ARM pull afterwards doesn't cause me to do a
compile-test either, since I don't cross-compile).

Cc: Don Zickus <dzickus@redhat.com>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

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)