diff options
| author | Linus Torvalds | 2014-03-08 03:58:40 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-08 03:58:40 +0100 |
| commit | b01d4e68933ec23e43b1046fa35d593cefcf37d1 (patch) | |
| tree | 818e5d0bda5fe1ed18ec032b6b744f107d7f4206 /net/sched/sch_tbf.c | |
| parent | Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm (diff) | |
| download | kernel-qcow2-linux-b01d4e68933ec23e43b1046fa35d593cefcf37d1.tar.gz kernel-qcow2-linux-b01d4e68933ec23e43b1046fa35d593cefcf37d1.tar.xz kernel-qcow2-linux-b01d4e68933ec23e43b1046fa35d593cefcf37d1.zip | |
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>
Diffstat (limited to 'net/sched/sch_tbf.c')
0 files changed, 0 insertions, 0 deletions