]> Pileus Git - ~andy/linux/commit
x86: fix compile error due to X86_TRAP_NMI use in asm files
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Mar 2014 02:58:40 +0000 (18:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Mar 2014 02:58:40 +0000 (18:58 -0800)
commitb01d4e68933ec23e43b1046fa35d593cefcf37d1
tree818e5d0bda5fe1ed18ec032b6b744f107d7f4206
parent4d7eaa12f33c07436939926600638b0d6ab73999
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>
arch/x86/kernel/head_32.S
arch/x86/kernel/head_64.S