aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPratyush Anand <panand@redhat.com>2014-12-19 14:58:22 +0530
committerSteve Capper <steve.capper@linaro.org>2015-01-27 16:46:19 +0000
commit8a0e34370c8ee5191630f51ba6b0ce1ab6ba1031 (patch)
treea0c23c3c47b8430f0b7a973c0609d5ad6cee6b1b
parent1c021aa17bfc4e5c2681ed27808a4eb8304798ca (diff)
downloadlinux-8a0e34370c8ee5191630f51ba6b0ce1ab6ba1031.tar.gz
ARM64: Move BRK opcodes defines from kprobes.h to debug-monitors.h
Its better to keep all BRK opcodes used by kprobes and uprobes at one place. Therefore move these defines to asm/debug-monitors.h. Signed-off-by: Pratyush Anand <panand@redhat.com>
-rw-r--r--arch/arm64/include/asm/debug-monitors.h5
-rw-r--r--arch/arm64/kernel/kprobes.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
index 40ec68aa687..5f196ee8d97 100644
--- a/arch/arm64/include/asm/debug-monitors.h
+++ b/arch/arm64/include/asm/debug-monitors.h
@@ -35,6 +35,11 @@
#define DBG_ESR_EVT_HWWP 0x2
#define DBG_ESR_EVT_BRK 0x6
+/* BRK opcodes with ESR encoding */
+#define BRK64_ESR_MASK 0xFFFF
+#define BRK64_ESR_KPROBES 0x0004
+#define BRK64_OPCODE_KPROBES 0xD4200080 /* "brk 0x4" */
+
/*
* Break point instruction encoding
*/
diff --git a/arch/arm64/kernel/kprobes.h b/arch/arm64/kernel/kprobes.h
index 614d3638f82..93923164eec 100644
--- a/arch/arm64/kernel/kprobes.h
+++ b/arch/arm64/kernel/kprobes.h
@@ -16,10 +16,7 @@
#ifndef _ARM_KERNEL_KPROBES_H
#define _ARM_KERNEL_KPROBES_H
-/* BRK opcodes with ESR encoding */
-#define BRK64_ESR_MASK 0xFFFF
-#define BRK64_ESR_KPROBES 0x0004
-#define BRK64_OPCODE_KPROBES 0xD4200080 /* "brk 0x4" */
+#include <asm/debug-monitors.h>
#define JPROBES_MAGIC_NUM 0xa5a5a5a5a5a5a5a5