aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 21:56:07 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:20:29 +0200
commitc6df0d71bec391e78e0a38109d63154acd69a937 (patch)
tree33f59d1495d79e8d56f4831e8c8c1305e650127e /arch/x86
parentf5ca81878b42ae7d1b00d0ed5f62bb1a158bfac1 (diff)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/traps_32.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 16c056ba14e..e2598505ef5 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);