leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Introduced in commit 5fa10196bd ("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>
This commit is contained in:
Linus Torvalds 2014-03-07 18:58:40 -08:00
parent 4d7eaa12f3
commit b01d4e6893
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/head_32.S
View File

@ -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

2
arch/x86/kernel/head_64.S
View File

@ -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)