aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-09 21:55:58 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:20:08 +0200
commitb94da1e4b7d396abe10ce4d566f1a5f623602c21 (patch)
treeccd0e3c5a96501d98d04dcd8e33a7aa4f6c70c8c
parent976382dcbe3a2233f48cda5b0840874f43a30825 (diff)
i386: expand exception 3 DO_TRAP macro
The int3 exception was already takes as an interrupt and do_int3 does not fit in the new DO_ERROR macro. This patch just expands the DO_TRAP macro and rearranges the code a bit. No functional changes intended. Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/traps_32.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index c18824b9d1a..e3c4809f414 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -633,9 +633,6 @@ void do_##name(struct pt_regs *regs, long error_code) \
}
DO_VM86_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip)
-#ifndef CONFIG_KPROBES
-DO_VM86_TRAP(3, SIGTRAP, "int3", int3)
-#endif
DO_VM86_TRAP(4, SIGSEGV, "overflow", overflow)
DO_VM86_TRAP(5, SIGSEGV, "bounds", bounds)
DO_TRAP_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
@@ -907,9 +904,9 @@ void restart_nmi(void)
acpi_nmi_enable();
}
-#ifdef CONFIG_KPROBES
void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
+#ifdef CONFIG_KPROBES
trace_hardirqs_fixup();
if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
@@ -920,10 +917,14 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code)
* disabled. Normal trap handlers don't.
*/
conditional_sti(regs);
+#else
+ if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP)
+ == NOTIFY_STOP)
+ return;
+#endif
do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
}
-#endif
/*
* Our handling of the processor debug registers is non-trivial.