From: Jon Medhurst Date: Wed, 6 Jul 2011 19:33:41 +0000 (+0100) Subject: ARM: kprobes: Move is_writeback define to header file. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b59d874660be7f790861ad849858cc009089515;p=mv-sheeva.git ARM: kprobes: Move is_writeback define to header file. This will be used later in other files. Signed-off-by: Jon Medhurst Acked-by: Nicolas Pitre --- diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/kernel/kprobes-arm.c index 8d4464f9471..3c4678edcbf 100644 --- a/arch/arm/kernel/kprobes-arm.c +++ b/arch/arm/kernel/kprobes-arm.c @@ -69,12 +69,6 @@ #define is_r15(insn, bitpos) (((insn) & (0xf << bitpos)) == (0xf << bitpos)) -/* - * Test if load/store instructions writeback the address register. - * if P (bit 24) == 0 or W (bit 21) == 1 - */ -#define is_writeback(insn) ((insn ^ 0x01000000) & 0x01200000) - #define PSR_fs (PSR_f|PSR_s) #define KPROBE_RETURN_INSTRUCTION 0xe1a0f00e /* mov pc, lr */ diff --git a/arch/arm/kernel/kprobes.h b/arch/arm/kernel/kprobes.h index 792f2316227..4de2f37b1a8 100644 --- a/arch/arm/kernel/kprobes.h +++ b/arch/arm/kernel/kprobes.h @@ -36,4 +36,10 @@ void __init arm_kprobe_decode_init(void); extern kprobe_check_cc * const kprobe_condition_checks[16]; +/* + * Test if load/store instructions writeback the address register. + * if P (bit 24) == 0 or W (bit 21) == 1 + */ +#define is_writeback(insn) ((insn ^ 0x01000000) & 0x01200000) + #endif /* _ARM_KERNEL_KPROBES_H */