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)
committerJiri Slaby <jslaby@suse.cz>
Sat, 22 Mar 2014 21:01:54 +0000 (22:01 +0100)
commitf4592be7d7d62c137999e058288618398fe2babc
tree3b42c92cc05d99f2b42d86251891b45bdd15dc40
parent8ee7e9f35c9327cedcefc28ce6ad4f30b20bc579
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: Jiri Slaby <jslaby@suse.cz>
arch/x86/kernel/head_32.S
arch/x86/kernel/head_64.S