aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 21:56:01 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:20:15 +0200
commit12394cf567d509f6ab5d94544e1f414b35286d9e (patch)
tree9e5811e30e8e95ff1ee4c36489f0165ba4704b12 /arch
parent64f644c0b4b8b7818867fb27de077c98c4f0022b (diff)
i386: convert hardware exception 6 to an interrupt gate
Handle invalid opcode 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')
-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 06149083763..39a6101a612 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -635,7 +635,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_ERROR(5, SIGSEGV, "bounds", bounds)
-DO_TRAP_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
+DO_ERROR_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)
DO_TRAP(11, SIGBUS, "segment not present", segment_not_present)
@@ -1254,7 +1254,7 @@ void __init trap_init(void)
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_intr_gate(5, &bounds);
- set_trap_gate(6, &invalid_op);
+ set_intr_gate(6, &invalid_op);
set_trap_gate(7, &device_not_available);
set_task_gate(8, GDT_ENTRY_DOUBLEFAULT_TSS);
set_trap_gate(9, &coprocessor_segment_overrun);