diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-08 02:58:40 (GMT) |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-03-22 21:01:54 (GMT) |
| commit | f4592be7d7d62c137999e058288618398fe2babc (patch) | |
| tree | 3b42c92cc05d99f2b42d86251891b45bdd15dc40 /arch/x86/kernel/amd_gart_64.c | |
| parent | 8ee7e9f35c9327cedcefc28ce6ad4f30b20bc579 (diff) | |
| download | linux-fsl-qoriq-f4592be7d7d62c137999e058288618398fe2babc.tar.xz | |
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>
Diffstat (limited to 'arch/x86/kernel/amd_gart_64.c')
0 files changed, 0 insertions, 0 deletions