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

commit b01d4e68933ec23e43b1046fa35d593cefcf37d1 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index e194842b0937cbbf383139ddc1593e0c413212f2..df63cae573e0809f6256b69570f6d39ebb0dee33 100644 (file)
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -567,7 +567,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 9035aefdfc3add326c2d1ecf212b6794a44d0c9e..f2a9a2aa98f31f0a3dced6909c69d243f3f9a4f4 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)