diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-02-20 15:18:13 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-03-06 18:52:32 +0000 |
| commit | 4e829b6735475313016787ec3d256e102167b94d (patch) | |
| tree | 3a8c74f4e5b95031bf1dbfa9bd8fb770b73494a1 | |
| parent | a26731d9d1e3fa93db0b5781d7e8dd9dbff1313e (diff) | |
| download | linux-0-day-4e829b6735475313016787ec3d256e102167b94d.tar.gz linux-0-day-4e829b6735475313016787ec3d256e102167b94d.tar.xz | |
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>
| -rw-r--r-- | arch/arm64/kernel/debug-monitors.c | 3 | ||||
| -rw-r--r-- | arch/arm64/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/traps.c | 9 |
3 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index 53781f5687c54..06ca574495af9 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -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, diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 9ae31f7e22436..6228476e74ba3 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -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); } /* diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index b139fe2d21260..2b478565d7749 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -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 |