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

Commit eb642f62 authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

i386: convert hardware exception 18 to an interrupt gate 



Handle machine check exception with interrupt initially off.

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5feedfd4

arch/x86/kernel/entry_32.S

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ ENTRY(machine_check) 
	RING0_INT_FRAME

	pushl $0

	CFI_ADJUST_CFA_OFFSET 4

	pushl machine_check_vector

	pushl $do_machine_check

	CFI_ADJUST_CFA_OFFSET 4

	jmp error_code

	CFI_ENDPROC

arch/x86/kernel/traps_32.c

+10 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#include <asm/traps.h>



#include "mach_traps.h"

#include "cpu/mcheck/mce.h"



DECLARE_BITMAP(used_vectors, NR_VECTORS);

EXPORT_SYMBOL_GPL(used_vectors);
@@ -1252,6 +1253,14 @@ void __kprobes do_device_not_available(struct pt_regs *regs, long error) 
	}

}



#ifdef CONFIG_X86_MCE

void __kprobes do_machine_check(struct pt_regs *regs, long error)

{

	conditional_sti(regs);

	machine_check_vector(regs, error);

}

#endif



void __init trap_init(void)

{

	int i;
@@ -1283,7 +1292,7 @@ void __init trap_init(void) 
	set_intr_gate(16, &coprocessor_error);

	set_intr_gate(17, &alignment_check);

#ifdef CONFIG_X86_MCE

	set_trap_gate(18, &machine_check);

	set_intr_gate(18, &machine_check);

#endif

	set_trap_gate(19, &simd_coprocessor_error);