diff options
| author | Jon Medhurst <tixy@yxit.co.uk> | 2011-07-07 20:58:29 +0200 |
|---|---|---|
| committer | Tixy <tixy@medhuaa1.miniserver.com> | 2011-07-13 19:32:41 +0200 |
| commit | aea490299f7f0412f884a4895bc96211d8d8dbaf (patch) | |
| tree | ef4ad811403f718f4923213ac53e9fb793dafc11 /arch/arm/kernel/kprobes-common.c | |
| parent | ARM: kprobes: Move find_str_pc_offset into kprobes-common.c (diff) | |
| download | linux-aea490299f7f0412f884a4895bc96211d8d8dbaf.tar.xz linux-aea490299f7f0412f884a4895bc96211d8d8dbaf.zip | |
ARM: kprobes: Make str_pc_offset a constant on ARMv7
The str_pc_offset value is architecturally defined on ARMv7 onwards so
we can make it a compile time constant. This means on Thumb kernels the
runtime checking code isn't needed, which saves us from having to fix it
to work for Thumb.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/kernel/kprobes-common.c')
| -rw-r--r-- | arch/arm/kernel/kprobes-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/kprobes-common.c b/arch/arm/kernel/kprobes-common.c index e18576cca6cf..87e91ce4d495 100644 --- a/arch/arm/kernel/kprobes-common.c +++ b/arch/arm/kernel/kprobes-common.c @@ -17,6 +17,8 @@ #include "kprobes.h" +#ifndef find_str_pc_offset + /* * For STR and STM instructions, an ARM core may choose to use either * a +8 or a +12 displacement from the current instruction's address. @@ -40,6 +42,8 @@ void __init find_str_pc_offset(void) str_pc_offset = ret; } +#endif /* !find_str_pc_offset */ + void __init arm_kprobe_decode_init(void) { |