diff options
author | Jon Medhurst <tixy@yxit.co.uk> | 2011-07-06 15:33:41 -0400 |
---|---|---|
committer | Tixy <tixy@medhuaa1.miniserver.com> | 2011-07-13 13:32:41 -0400 |
commit | 1b59d874660be7f790861ad849858cc009089515 (patch) | |
tree | 250d4d0945dc5aab95e4f32393d6fd562c327522 | |
parent | 0ab4c02ddae2e1d32d686a7773608f6c44fb2a83 (diff) |
ARM: kprobes: Move is_writeback define to header file.
This will be used later in other files.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r-- | arch/arm/kernel/kprobes-arm.c | 6 | ||||
-rw-r--r-- | arch/arm/kernel/kprobes.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/kernel/kprobes-arm.c index 8d4464f9471b..3c4678edcbf8 100644 --- a/arch/arm/kernel/kprobes-arm.c +++ b/arch/arm/kernel/kprobes-arm.c | |||
@@ -69,12 +69,6 @@ | |||
69 | 69 | ||
70 | #define is_r15(insn, bitpos) (((insn) & (0xf << bitpos)) == (0xf << bitpos)) | 70 | #define is_r15(insn, bitpos) (((insn) & (0xf << bitpos)) == (0xf << bitpos)) |
71 | 71 | ||
72 | /* | ||
73 | * Test if load/store instructions writeback the address register. | ||
74 | * if P (bit 24) == 0 or W (bit 21) == 1 | ||
75 | */ | ||
76 | #define is_writeback(insn) ((insn ^ 0x01000000) & 0x01200000) | ||
77 | |||
78 | #define PSR_fs (PSR_f|PSR_s) | 72 | #define PSR_fs (PSR_f|PSR_s) |
79 | 73 | ||
80 | #define KPROBE_RETURN_INSTRUCTION 0xe1a0f00e /* mov pc, lr */ | 74 | #define KPROBE_RETURN_INSTRUCTION 0xe1a0f00e /* mov pc, lr */ |
diff --git a/arch/arm/kernel/kprobes.h b/arch/arm/kernel/kprobes.h index 792f2316227a..4de2f37b1a85 100644 --- a/arch/arm/kernel/kprobes.h +++ b/arch/arm/kernel/kprobes.h | |||
@@ -36,4 +36,10 @@ void __init arm_kprobe_decode_init(void); | |||
36 | 36 | ||
37 | extern kprobe_check_cc * const kprobe_condition_checks[16]; | 37 | extern kprobe_check_cc * const kprobe_condition_checks[16]; |
38 | 38 | ||
39 | /* | ||
40 | * Test if load/store instructions writeback the address register. | ||
41 | * if P (bit 24) == 0 or W (bit 21) == 1 | ||
42 | */ | ||
43 | #define is_writeback(insn) ((insn ^ 0x01000000) & 0x01200000) | ||
44 | |||
39 | #endif /* _ARM_KERNEL_KPROBES_H */ | 45 | #endif /* _ARM_KERNEL_KPROBES_H */ |