From a8b2f88124918ecf1be77dc0a3bda815740a18f3 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Wed, 6 Jul 2011 20:33:41 +0100 Subject: [PATCH] --- yaml --- r: 258325 b: refs/heads/master c: 1b59d874660be7f790861ad849858cc009089515 h: refs/heads/master i: 258323: 6824deab22620f1b270de1be988f3d637ad428ad v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/kprobes-arm.c | 6 ------ trunk/arch/arm/kernel/kprobes.h | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7e434ad2dfa1..310169d9cc43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ab4c02ddae2e1d32d686a7773608f6c44fb2a83 +refs/heads/master: 1b59d874660be7f790861ad849858cc009089515 diff --git a/trunk/arch/arm/kernel/kprobes-arm.c b/trunk/arch/arm/kernel/kprobes-arm.c index 8d4464f9471b..3c4678edcbf8 100644 --- a/trunk/arch/arm/kernel/kprobes-arm.c +++ b/trunk/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/trunk/arch/arm/kernel/kprobes.h b/trunk/arch/arm/kernel/kprobes.h index 792f2316227a..4de2f37b1a85 100644 --- a/trunk/arch/arm/kernel/kprobes.h +++ b/trunk/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 */