aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 21:56:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:20:22 +0200
commit6bf77bf93938ae6baad9945a0ba57b3225e8e58b (patch)
tree6b7c14fb96b505e0131d7cc3adbfae11f3f8d3c4
parent51bc1ed6060e96de5099f604071961540880efc2 (diff)
i386: convert hardware exception 10 to an interrupt gate
Handle invalid TSS exception with interrupt initially off. Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/traps_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index d26f32308db..069075e19ea 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -638,7 +638,7 @@ DO_VM86_ERROR(4, SIGSEGV, "overflow", overflow)
DO_VM86_ERROR(5, SIGSEGV, "bounds", bounds)
DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun)
-DO_TRAP(10, SIGSEGV, "invalid TSS", invalid_TSS)
+DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
DO_TRAP(11, SIGBUS, "segment not present", segment_not_present)
DO_TRAP(12, SIGBUS, "stack segment", stack_segment)
DO_TRAP_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
@@ -1270,7 +1270,7 @@ void __init trap_init(void)
set_intr_gate(7, &device_not_available);
set_task_gate(8, GDT_ENTRY_DOUBLEFAULT_TSS);
set_intr_gate(9, &coprocessor_segment_overrun);
- set_trap_gate(10, &invalid_TSS);
+ set_intr_gate(10, &invalid_TSS);
set_trap_gate(11, &segment_not_present);
set_trap_gate(12, &stack_segment);
set_trap_gate(13, &general_protection);