aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps_32.c
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 15:56:06 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-13 04:20:27 -0400
commitf5ca81878b42ae7d1b00d0ed5f62bb1a158bfac1 (patch)
treeef29e85fd45416a2a7aa7b6d3031844ecaa36a23 /arch/x86/kernel/traps_32.c
parent36d936c7988ac5caf575bc0e2dc618dbfebc6065 (diff)
i386: convert hardware exception 12 to an interrupt gate
Handle stack segment 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.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 6910bbe94f6c..16c056ba14ee 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -640,7 +640,7 @@ DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
640DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) 640DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun)
641DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) 641DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
642DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) 642DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
643DO_TRAP(12, SIGBUS, "stack segment", stack_segment) 643DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
644DO_TRAP_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) 644DO_TRAP_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
645DO_TRAP_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1) 645DO_TRAP_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)
646 646
@@ -1272,7 +1272,7 @@ void __init trap_init(void)
1272 set_intr_gate(9, &coprocessor_segment_overrun); 1272 set_intr_gate(9, &coprocessor_segment_overrun);
1273 set_intr_gate(10, &invalid_TSS); 1273 set_intr_gate(10, &invalid_TSS);
1274 set_intr_gate(11, &segment_not_present); 1274 set_intr_gate(11, &segment_not_present);
1275 set_trap_gate(12, &stack_segment); 1275 set_intr_gate(12, &stack_segment);
1276 set_trap_gate(13, &general_protection); 1276 set_trap_gate(13, &general_protection);
1277 set_intr_gate(14, &page_fault); 1277 set_intr_gate(14, &page_fault);
1278 set_trap_gate(15, &spurious_interrupt_bug); 1278 set_trap_gate(15, &spurious_interrupt_bug);