diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
commit | 232c28fe23b88e7027c6a20965d6e78421a40532 (patch) | |
tree | 5aa60cbba4879c913ddd8ee7a7d835c56e53ed8e /arch/arm64/include/asm/hw_breakpoint.h | |
parent | 54640cfe47251cd8acd7145ff86bcaf4db0e9616 (diff) | |
parent | 56026a89e632af0cf45602dee1b2881bf21c4eba (diff) | |
download | common-232c28fe23b88e7027c6a20965d6e78421a40532.tar.gz |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.ydeprecated/android-4.4.yandroid-4.4.y
Change-Id: Icf907f5067fb6da5935ab0d3271df54b8d5df405
Diffstat (limited to 'arch/arm64/include/asm/hw_breakpoint.h')
-rw-r--r-- | arch/arm64/include/asm/hw_breakpoint.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/hw_breakpoint.h b/arch/arm64/include/asm/hw_breakpoint.h index 9732908bfc8a..c72b8e201ab4 100644 --- a/arch/arm64/include/asm/hw_breakpoint.h +++ b/arch/arm64/include/asm/hw_breakpoint.h @@ -68,7 +68,11 @@ static inline void decode_ctrl_reg(u32 reg, /* Lengths */ #define ARM_BREAKPOINT_LEN_1 0x1 #define ARM_BREAKPOINT_LEN_2 0x3 +#define ARM_BREAKPOINT_LEN_3 0x7 #define ARM_BREAKPOINT_LEN_4 0xf +#define ARM_BREAKPOINT_LEN_5 0x1f +#define ARM_BREAKPOINT_LEN_6 0x3f +#define ARM_BREAKPOINT_LEN_7 0x7f #define ARM_BREAKPOINT_LEN_8 0xff /* Kernel stepping */ @@ -110,7 +114,7 @@ struct perf_event; struct pmu; extern int arch_bp_generic_fields(struct arch_hw_breakpoint_ctrl ctrl, - int *gen_len, int *gen_type); + int *gen_len, int *gen_type, int *offset); extern int arch_check_bp_in_kernelspace(struct perf_event *bp); extern int arch_validate_hwbkpt_settings(struct perf_event *bp); extern int hw_breakpoint_exceptions_notify(struct notifier_block *unused, |