summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/traps.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2019-02-26 16:06:42 +0100
committerWill Deacon <will.deacon@arm.com>2019-04-09 12:21:13 +0200
commit453b7740ebfda2d84be7fb583c54f0c91c592869 (patch)
tree1108d1c08094213cc18a7f8e4daae990f0aa99a3 /arch/arm64/kernel/traps.c
parentarm64: debug: Remove redundant user_mode(regs) checks from debug handlers (diff)
downloadlinux-453b7740ebfda2d84be7fb583c54f0c91c592869.tar.xz
linux-453b7740ebfda2d84be7fb583c54f0c91c592869.zip
arm64: probes: Move magic BRK values into brk-imm.h
kprobes and uprobes reserve some BRK immediates for installing their probes. Define these along with the other reservations in brk-imm.h and rename the ESR definitions to be consistent with the others that we already have. Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/traps.c')
-rw-r--r--arch/arm64/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 091379744d2f..74598396e0bf 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -1024,7 +1024,7 @@ int __init early_brk64(unsigned long addr, unsigned int esr,
struct pt_regs *regs)
{
#ifdef CONFIG_KASAN_SW_TAGS
- unsigned int comment = esr & BRK64_ESR_MASK;
+ unsigned int comment = esr & ESR_ELx_BRK64_ISS_COMMENT_MASK;
if ((comment & ~KASAN_BRK_MASK) == KASAN_BRK_IMM)
return kasan_handler(regs, esr) != DBG_HOOK_HANDLED;