From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Tue, 9 Sep 2008 19:56:07 +0000 (+0200)
Subject: i386: convert hardware exception 13 to an interrupt gate
X-Git-Tag: firefly_0821_release~17719^2~82
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c6df0d71bec391e78e0a38109d63154acd69a937;p=firefly-linux-kernel-4.4.55.git

i386: convert hardware exception 13 to an interrupt gate

Handle general protection exception with interrupt initially off.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 16c056ba14ee..e2598505ef5c 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -652,6 +652,8 @@ do_general_protection(struct pt_regs *regs, long error_code)
 	struct tss_struct *tss;
 	int cpu;
 
+	conditional_sti(regs);
+
 	cpu = get_cpu();
 	tss = &per_cpu(init_tss, cpu);
 	thread = &current->thread;
@@ -1273,7 +1275,7 @@ void __init trap_init(void)
 	set_intr_gate(10, &invalid_TSS);
 	set_intr_gate(11, &segment_not_present);
 	set_intr_gate(12, &stack_segment);
-	set_trap_gate(13, &general_protection);
+	set_intr_gate(13, &general_protection);
 	set_intr_gate(14, &page_fault);
 	set_trap_gate(15, &spurious_interrupt_bug);
 	set_trap_gate(16, &coprocessor_error);