Commit
b01d4e68933ec23e43b1046fa35d593cefcf37d1
Exists in
master
and in
16 other branches
dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y
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>
Showing
2 changed files
with
2 additions
and
2 deletions
Side-by-side Diff
| ... |
... |
@@ -545,7 +545,7 @@ |
|
545
|
545 |
ENTRY(early_idt_handler) |
|
546
|
546 |
cld |
|
547
|
547 |
|
|
548
|
|
- cmpl $X86_TRAP_NMI,(%esp) |
|
|
548 |
+ cmpl $2,(%esp) # X86_TRAP_NMI |
|
549
|
549 |
je is_nmi # Ignore NMI |
|
550
|
550 |
|
|
551
|
551 |
cmpl $2,%ss:early_recursion_flag |
| ... |
... |
@@ -343,7 +343,7 @@ |
|
343
|
343 |
ENTRY(early_idt_handler) |
|
344
|
344 |
cld |
|
345
|
345 |
|
|
346
|
|
- cmpl $X86_TRAP_NMI,(%rsp) |
|
|
346 |
+ cmpl $2,(%rsp) # X86_TRAP_NMI |
|
347
|
347 |
je is_nmi # Ignore NMI |
|
348
|
348 |
|
|
349
|
349 |
cmpl $2,early_recursion_flag(%rip) |
