i386: convert hardware exception 5 to an interrupt gate
authorAlexander van Heukelum <heukelum@fastmail.fm>
Tue, 9 Sep 2008 19:56:00 +0000 (21:56 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 13 Oct 2008 08:20:13 +0000 (10:20 +0200)
Handle bounds exception with interrupt initially off.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/traps_32.c

index 6f685e61325aff7651ec943072fa15960d311b3d..06149083763e9f07ddc41c0ab849686a2dcea444 100644 (file)
@@ -634,7 +634,7 @@ void do_##name(struct pt_regs *regs, long error_code)                       \
 
 DO_VM86_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip)
 DO_VM86_ERROR(4, SIGSEGV, "overflow", overflow)
-DO_VM86_TRAP(5, SIGSEGV, "bounds", bounds)
+DO_VM86_ERROR(5, SIGSEGV, "bounds", bounds)
 DO_TRAP_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
 DO_TRAP(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun)
 DO_TRAP(10, SIGSEGV, "invalid TSS", invalid_TSS)
@@ -1253,7 +1253,7 @@ void __init trap_init(void)
        set_intr_gate(2, &nmi);
        set_system_intr_gate(3, &int3); /* int3 can be called from all */
        set_system_intr_gate(4, &overflow); /* int4 can be called from all */
-       set_trap_gate(5, &bounds);
+       set_intr_gate(5, &bounds);
        set_trap_gate(6, &invalid_op);
        set_trap_gate(7, &device_not_available);
        set_task_gate(8, GDT_ENTRY_DOUBLEFAULT_TSS);