Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b01d4e68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 5fa10196 ("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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4d7eaa12

arch/x86/kernel/head_32.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -545,7 +545,7 @@ ENDPROC(early_idt_handlers) 
ENTRY(early_idt_handler)

ENTRY(early_idt_handler)

	cld

	cld





	cmpl $X86_TRAP_NMI,(%esp)

	cmpl $2,(%esp)		# X86_TRAP_NMI

	je is_nmi		# Ignore NMI

	je is_nmi		# Ignore NMI





	cmpl $2,%ss:early_recursion_flag

	cmpl $2,%ss:early_recursion_flag

arch/x86/kernel/head_64.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -343,7 +343,7 @@ early_idt_handlers: 
ENTRY(early_idt_handler)

ENTRY(early_idt_handler)

	cld

	cld





	cmpl $X86_TRAP_NMI,(%rsp)

	cmpl $2,(%rsp)		# X86_TRAP_NMI

	je is_nmi		# Ignore NMI

	je is_nmi		# Ignore NMI





	cmpl $2,early_recursion_flag(%rip)

	cmpl $2,early_recursion_flag(%rip)