From 7facc1b94a5b25361fa477a8cede777dcbcbac64 Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@yxit.co.uk>
Date: Thu, 7 Jul 2011 19:58:29 +0100
Subject: [PATCH] --- yaml --- r: 258327 b: refs/heads/master c:
 aea490299f7f0412f884a4895bc96211d8d8dbaf h: refs/heads/master i:   258325:
 a8b2f88124918ecf1be77dc0a3bda815740a18f3   258323:
 6824deab22620f1b270de1be988f3d637ad428ad   258319:
 f58cadbaa814c1795515237970cedb85b5cf046f v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/kernel/kprobes-common.c |  4 ++++
 trunk/arch/arm/kernel/kprobes.h        | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d39e7118dd93..00e85ec702c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c8df3300f60cae54aeb2a6dda8efe7ffe16a322
+refs/heads/master: aea490299f7f0412f884a4895bc96211d8d8dbaf
diff --git a/trunk/arch/arm/kernel/kprobes-common.c b/trunk/arch/arm/kernel/kprobes-common.c
index e18576cca6cf..87e91ce4d495 100644
--- a/trunk/arch/arm/kernel/kprobes-common.c
+++ b/trunk/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)
 {
diff --git a/trunk/arch/arm/kernel/kprobes.h b/trunk/arch/arm/kernel/kprobes.h
index 43f630d7f03d..406bb2da7fea 100644
--- a/trunk/arch/arm/kernel/kprobes.h
+++ b/trunk/arch/arm/kernel/kprobes.h
@@ -36,7 +36,21 @@ void __init arm_kprobe_decode_init(void);
 
 extern kprobe_check_cc * const kprobe_condition_checks[16];
 
+
+#if __LINUX_ARM_ARCH__ >= 7
+
+/* str_pc_offset is architecturally defined from ARMv7 onwards */
+#define str_pc_offset 8
+#define find_str_pc_offset()
+
+#else /* __LINUX_ARM_ARCH__ < 7 */
+
+/* We need a run-time check to determine str_pc_offset */
 extern int str_pc_offset;
+void __init find_str_pc_offset(void);
+
+#endif
+
 
 /*
  * Test if load/store instructions writeback the address register.