diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 18:58:40 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-23 21:38:15 -0700 |
commit | 4a24592bfc9b33c917cfbdba1f365216938fdbc9 (patch) | |
tree | 1c3a29353259880f761e51c9ac2dcb102a272dbc /lib/debugobjects.c | |
parent | a56c57c055ecc75f4375d60c783a0b578edd763c (diff) |
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>
Diffstat (limited to 'lib/debugobjects.c')
0 files changed, 0 insertions, 0 deletions