---

yaml --- r: 113494 b: refs/heads/master c: 12394cf h: refs/heads/master v: v3
git-mirror · Oct 13, 2008 · 4f49c02 · 4f49c02
1 parent dde41a4
commit 4f49c02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64f644c0b4b8b7818867fb27de077c98c4f0022b
+refs/heads/master: 12394cf567d509f6ab5d94544e1f414b35286d9e
diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/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);