arm64: Use arm64_force_sig_info instead of force_sig_info
Using arm64_force_sig_info means that printing messages about unhandled signals is dealt with for us, so use that in preference to force_sig_info and remove any homebrew printing code. Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
parent
a26731d9d1
commit
4e829b6735
|
@ -33,6 +33,7 @@
|
|||
#include <asm/daifflags.h>
|
||||
#include <asm/debug-monitors.h>
|
||||
#include <asm/system_misc.h>
|
||||
#include <asm/traps.h>
|
||||
|
||||
/* Determine debug architecture. */
|
||||
u8 debug_monitors_arch(void)
|
||||
|
@ -223,7 +224,7 @@ static void send_user_sigtrap(int si_code)
|
|||
if (interrupts_enabled(regs))
|
||||
local_irq_enable();
|
||||
|
||||
force_sig_info(SIGTRAP, &info, current);
|
||||
arm64_force_sig_info(&info, "User debug trap", current);
|
||||
}
|
||||
|
||||
static int single_step_handler(unsigned long addr, unsigned int esr,
|
||||
|
|
|
@ -209,7 +209,7 @@ static void ptrace_hbptriggered(struct perf_event *bp,
|
|||
force_sig_ptrace_errno_trap(si_errno, (void __user *)bkpt->trigger);
|
||||
}
|
||||
#endif
|
||||
force_sig_info(SIGTRAP, &info, current);
|
||||
arm64_force_sig_info(&info, "Hardware breakpoint trap (ptrace)", current);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -633,11 +633,6 @@ asmlinkage void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr)
|
|||
{
|
||||
siginfo_t info;
|
||||
void __user *pc = (void __user *)instruction_pointer(regs);
|
||||
console_verbose();
|
||||
|
||||
pr_crit("Bad EL0 synchronous exception detected on CPU%d, code 0x%08x -- %s\n",
|
||||
smp_processor_id(), esr, esr_get_class_string(esr));
|
||||
__show_regs(regs);
|
||||
|
||||
info.si_signo = SIGILL;
|
||||
info.si_errno = 0;
|
||||
|
@ -645,9 +640,9 @@ asmlinkage void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr)
|
|||
info.si_addr = pc;
|
||||
|
||||
current->thread.fault_address = 0;
|
||||
current->thread.fault_code = 0;
|
||||
current->thread.fault_code = esr;
|
||||
|
||||
force_sig_info(info.si_signo, &info, current);
|
||||
arm64_force_sig_info(&info, "Bad EL0 synchronous exception", current);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_VMAP_STACK
|
||||
|
|
Loading…
Reference in a new issue