diff options
author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-09-09 15:56:04 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:20:22 -0400 |
commit | 6bf77bf93938ae6baad9945a0ba57b3225e8e58b (patch) | |
tree | 6b7c14fb96b505e0131d7cc3adbfae11f3f8d3c4 /arch/x86/kernel/traps_32.c | |
parent | 51bc1ed6060e96de5099f604071961540880efc2 (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>
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
-rw-r--r-- | arch/x86/kernel/traps_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index d26f32308dbe..069075e19ea7 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) | |||
638 | DO_VM86_ERROR(5, SIGSEGV, "bounds", bounds) | 638 | DO_VM86_ERROR(5, SIGSEGV, "bounds", bounds) |
639 | DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0) | 639 | DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0) |
640 | DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) | 640 | DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) |
641 | DO_TRAP(10, SIGSEGV, "invalid TSS", invalid_TSS) | 641 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) |
642 | DO_TRAP(11, SIGBUS, "segment not present", segment_not_present) | 642 | DO_TRAP(11, SIGBUS, "segment not present", segment_not_present) |
643 | DO_TRAP(12, SIGBUS, "stack segment", stack_segment) | 643 | DO_TRAP(12, SIGBUS, "stack segment", stack_segment) |
644 | DO_TRAP_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) | 644 | DO_TRAP_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) |
@@ -1270,7 +1270,7 @@ void __init trap_init(void) | |||
1270 | set_intr_gate(7, &device_not_available); | 1270 | set_intr_gate(7, &device_not_available); |
1271 | set_task_gate(8, GDT_ENTRY_DOUBLEFAULT_TSS); | 1271 | set_task_gate(8, GDT_ENTRY_DOUBLEFAULT_TSS); |
1272 | set_intr_gate(9, &coprocessor_segment_overrun); | 1272 | set_intr_gate(9, &coprocessor_segment_overrun); |
1273 | set_trap_gate(10, &invalid_TSS); | 1273 | set_intr_gate(10, &invalid_TSS); |
1274 | set_trap_gate(11, &segment_not_present); | 1274 | set_trap_gate(11, &segment_not_present); |
1275 | set_trap_gate(12, &stack_segment); | 1275 | set_trap_gate(12, &stack_segment); |
1276 | set_trap_gate(13, &general_protection); | 1276 | set_trap_gate(13, &general_protection); |