lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i386: expand exception 3 DO_TRAP macro

Browse Source 
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>
This commit is contained in:
Alexander van Heukelum
2008-09-09 21:55:58 +02:00
committed by Ingo Molnar
parent 976382dcbe
commit b94da1e4b7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/traps_32.c
View File

@@ -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) 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(4, SIGSEGV, "overflow", overflow)
DO_VM86_TRAP(5, SIGSEGV, "bounds", bounds) DO_VM86_TRAP(5, SIGSEGV, "bounds", bounds)
DO_TRAP_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0) 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(); acpi_nmi_enable();
} }
#ifdef CONFIG_KPROBES
void __kprobes do_int3(struct pt_regs *regs, long error_code) void __kprobes do_int3(struct pt_regs *regs, long error_code)
{ {
#ifdef CONFIG_KPROBES
trace_hardirqs_fixup(); trace_hardirqs_fixup();
if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) 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. * disabled. Normal trap handlers don't.
*/ */
conditional_sti(regs); 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); do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
} }
#endif
/* /*
* Our handling of the processor debug registers is non-trivial. * Our handling of the processor debug registers is non-trivial.