summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/kprobes-common.c
diff options
context:
space:
mode:
authorJon Medhurst <tixy@yxit.co.uk>2011-07-07 19:58:29 +0100
committerTixy <tixy@medhuaa1.miniserver.com>2011-07-13 17:32:41 +0000
commitaea490299f7f0412f884a4895bc96211d8d8dbaf (patch)
treeef4ad811403f718f4923213ac53e9fb793dafc11 /arch/arm/kernel/kprobes-common.c
parent6c8df3300f60cae54aeb2a6dda8efe7ffe16a322 (diff)
downloadop-kernel-dev-aea490299f7f0412f884a4895bc96211d8d8dbaf.zip
op-kernel-dev-aea490299f7f0412f884a4895bc96211d8d8dbaf.tar.gz
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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/kprobes-common.c b/arch/arm/kernel/kprobes-common.c
index e18576c..87e91ce 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)
{
OpenPOWER on IntegriCloud