diff options
| author | Will Deacon <will.deacon@arm.com> | 2019-02-26 15:06:42 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-04-09 11:21:13 +0100 |
| commit | 453b7740ebfda2d84be7fb583c54f0c91c592869 (patch) | |
| tree | 1108d1c08094213cc18a7f8e4daae990f0aa99a3 /arch/arm64/include/asm/debug-monitors.h | |
| parent | fb610f2a2006322bebeb30408fefce6a01df09ea (diff) | |
| download | linux-stable-453b7740ebfda2d84be7fb583c54f0c91c592869.tar.gz linux-stable-453b7740ebfda2d84be7fb583c54f0c91c592869.tar.bz2 linux-stable-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/include/asm/debug-monitors.h')
| -rw-r--r-- | arch/arm64/include/asm/debug-monitors.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index 7d37cfa5cc16..0679f781696d 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -65,12 +65,9 @@ #define CACHE_FLUSH_IS_SAFE 1 /* kprobes BRK opcodes with ESR encoding */ -#define BRK64_ESR_MASK 0xFFFF -#define BRK64_ESR_KPROBES 0x0004 -#define BRK64_OPCODE_KPROBES (AARCH64_BREAK_MON | (BRK64_ESR_KPROBES << 5)) +#define BRK64_OPCODE_KPROBES (AARCH64_BREAK_MON | (KPROBES_BRK_IMM << 5)) /* uprobes BRK opcodes with ESR encoding */ -#define BRK64_ESR_UPROBES 0x0005 -#define BRK64_OPCODE_UPROBES (AARCH64_BREAK_MON | (BRK64_ESR_UPROBES << 5)) +#define BRK64_OPCODE_UPROBES (AARCH64_BREAK_MON | (UPROBES_BRK_IMM << 5)) /* AArch32 */ #define DBG_ESR_EVT_BKPT 0x4 |