x86/head: Move the early NMI fixup into C (0d0efc07) · Commits · 戴 / test

arch/x86/kernel/head_32.S

+0 −7

Original line number	Diff line number	Diff line
		@@ -561,9 +561,6 @@ early_idt_handler_common:
		*/
		cld

		cmpl $2,(%esp) # X86_TRAP_NMI
		je .Lis_nmi # Ignore NMI

		cmpl $2,%ss:early_recursion_flag
		je hlt_loop
		incl %ss:early_recursion_flag
		@@ -642,10 +639,6 @@ early_idt_handler_common:
		hlt_loop:
		hlt
		jmp hlt_loop

		.Lis_nmi:
		addl $8,%esp /* drop vector number and error code */
		iret
		ENDPROC(early_idt_handler_common)

		/* This is the default interrupt "handler" :-) */

+0 −6

Original line number	Diff line number	Diff line
		@@ -351,9 +351,6 @@ early_idt_handler_common:
		*/
		cld

		cmpl $2,(%rsp) # X86_TRAP_NMI
		je .Lis_nmi # Ignore NMI

		cmpl $2,early_recursion_flag(%rip)
		jz 1f
		incl early_recursion_flag(%rip)
		@@ -422,9 +419,6 @@ early_idt_handler_common:
		20: /* Exception table entry found or page table generated */
		decl early_recursion_flag(%rip)
		jmp restore_regs_and_iret
		.Lis_nmi:
		addq $16,%rsp # drop vector number and error code
		INTERRUPT_RETURN
		ENDPROC(early_idt_handler_common)

		__INITDATA

+5 −0

Original line number	Diff line number	Diff line
		#include <linux/module.h>
		#include <asm/uaccess.h>
		#include <asm/traps.h>

		typedef bool (ex_handler_t)(const struct exception_table_entry ,
		struct pt_regs *, int);
		@@ -89,6 +90,10 @@ int __init early_fixup_exception(struct pt_regs *regs, int trapnr)
		unsigned long new_ip;
		ex_handler_t handler;

		/* Ignore early NMIs. */
		if (trapnr == X86_TRAP_NMI)
		return 1;

		e = search_exception_tables(regs->ip);
		if (!e)
		return 0;