diff options
| author | Will Deacon | 2019-02-25 13:06:43 +0100 |
|---|---|---|
| committer | Will Deacon | 2019-04-09 12:21:12 +0200 |
| commit | 52c6d145da15a9a9cea14678be307c127ccc6ef5 (patch) | |
| tree | 5f3b901f74f3dd2b4f4806de1571fb64e76503b9 /arch/arm64/mm | |
| parent | kasan: Makefile: Replace -pg with CC_FLAGS_FTRACE (diff) | |
| download | kernel-qcow2-linux-52c6d145da15a9a9cea14678be307c127ccc6ef5.tar.gz kernel-qcow2-linux-52c6d145da15a9a9cea14678be307c127ccc6ef5.tar.xz kernel-qcow2-linux-52c6d145da15a9a9cea14678be307c127ccc6ef5.zip | |
arm64: debug: Remove unused return value from do_debug_exception()
do_debug_exception() goes out of its way to return a value that isn't
ever used, so just make the thing void.
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/fault.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 4f343e603925..0cb0e09995e1 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -810,13 +810,12 @@ void __init hook_debug_fault_code(int nr, debug_fault_info[nr].name = name; } -asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint, - unsigned int esr, - struct pt_regs *regs) +asmlinkage void __exception do_debug_exception(unsigned long addr_if_watchpoint, + unsigned int esr, + struct pt_regs *regs) { const struct fault_info *inf = esr_to_debug_fault_info(esr); unsigned long pc = instruction_pointer(regs); - int rv; /* * Tell lockdep we disabled irqs in entry.S. Do nothing if they were @@ -828,17 +827,12 @@ asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint, if (user_mode(regs) && !is_ttbr0_addr(pc)) arm64_apply_bp_hardening(); - if (!inf->fn(addr_if_watchpoint, esr, regs)) { - rv = 1; - } else { + if (inf->fn(addr_if_watchpoint, esr, regs)) { arm64_notify_die(inf->name, regs, inf->sig, inf->code, (void __user *)pc, esr); - rv = 0; } if (interrupts_enabled(regs)) trace_hardirqs_on(); - - return rv; } NOKPROBE_SYMBOL(do_debug_exception); |