Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 03:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: use fixup_exception() in traps_64.c

Browse Source 
Use the fixup_exception() helper instead of the open-coded
search_extable() users.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Harvey Harrison 2008-01-30 13:32:59 +01:00 committed by Ingo Molnar
parent 318aa296c3
commit b3a5acc17c
1 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
arch/x86/kernel/traps_64.c
View File

@ -601,19 +601,12 @@ static void __kprobes do_trap(int trapnr, int signr, char *str,
} }
/* kernel trap */ if (!fixup_exception(regs)) {
{ tsk->thread.error_code = error_code;
const struct exception_table_entry *fixup; tsk->thread.trap_no = trapnr;
fixup = search_exception_tables(regs->ip); die(str, regs, error_code);
if (fixup)
regs->ip = fixup->fixup;
else {
tsk->thread.error_code = error_code;
tsk->thread.trap_no = trapnr;
die(str, regs, error_code);
}
return;
} }
return;
} }
#define DO_ERROR(trapnr, signr, str, name) \ #define DO_ERROR(trapnr, signr, str, name) \
@ -703,22 +696,15 @@ asmlinkage void __kprobes do_general_protection(struct pt_regs * regs,
return; return;
} }
/* kernel gp */ if (fixup_exception(regs))
{ return;
const struct exception_table_entry *fixup;
fixup = search_exception_tables(regs->ip);
if (fixup) {
regs->ip = fixup->fixup;
return;
}
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
tsk->thread.trap_no = 13; tsk->thread.trap_no = 13;
if (notify_die(DIE_GPF, "general protection fault", regs, if (notify_die(DIE_GPF, "general protection fault", regs,
error_code, 13, SIGSEGV) == NOTIFY_STOP) error_code, 13, SIGSEGV) == NOTIFY_STOP)
return; return;
die("general protection fault", regs, error_code); die("general protection fault", regs, error_code);
}
} }
static __kprobes void static __kprobes void
@ -910,12 +896,9 @@ clear_TF_reenable:
static int kernel_math_error(struct pt_regs *regs, const char *str, int trapnr) static int kernel_math_error(struct pt_regs *regs, const char *str, int trapnr)
{ {
const struct exception_table_entry *fixup; if (fixup_exception(regs))
fixup = search_exception_tables(regs->ip);
if (fixup) {
regs->ip = fixup->fixup;
return 1; return 1;
}
notify_die(DIE_GPF, str, regs, 0, trapnr, SIGFPE); notify_die(DIE_GPF, str, regs, 0, trapnr, SIGFPE);
/* Illegal floating point operation in the kernel */ /* Illegal floating point operation in the kernel */
current->thread.trap_no = trapnr; current->thread.trap_no = trapnr;