diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 11:30:58 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-08 12:32:21 +0200 |
| commit | 5ccd3bd992cf668b5a6fa1713da7b443a35e2930 (patch) | |
| tree | e55f60946cf658ab396a1a0401833b67e71de196 /arch/arm/kernel/traps.c | |
| parent | ARM: 8867/1: vdso: pass --be8 to linker if necessary (diff) | |
| parent | ARM: 8863/1: stm32: select ARM errata 814220 (diff) | |
| download | linux-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.tar.xz linux-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.zip | |
Merge branches 'fixes' and 'misc'
Fix up the conflict between "VDSO: Drop implicit common-page-size
linker flag" and "vdso: pass --be8 to linker if necessary"
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 33af097c454b..3d7b48de2aea 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -725,10 +725,11 @@ baddataabort(int code, unsigned long instr, struct pt_regs *regs) #ifdef CONFIG_DEBUG_USER if (user_debug & UDBG_BADABORT) { + pr_err("8<--- cut here ---\n"); pr_err("[%d] %s: bad data abort: code %d instr 0x%08lx\n", task_pid_nr(current), current->comm, code, instr); dump_instr(KERN_ERR, regs); - show_pte(current->mm, addr); + show_pte(KERN_ERR, current->mm, addr); } #endif |