From a2196389c75db8b71d7e542a46510ff4be7cad49 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 25 Jun 2011 15:46:08 +0100
Subject: [PATCH] --- yaml --- r: 258180 b: refs/heads/master c:
 0402becef94c43bb2bb483653a5cee2fb5049764 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/entry-armv.S | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bd6f5bc70193..3d85cc060858 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac8b9c1ce094d43372d0259de08045ffee745a41
+refs/heads/master: 0402becef94c43bb2bb483653a5cee2fb5049764
diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S
index dbe9eb88d550..6855f6dd72d0 100644
--- a/trunk/arch/arm/kernel/entry-armv.S
+++ b/trunk/arch/arm/kernel/entry-armv.S
@@ -47,9 +47,9 @@
 	.macro	pabt_helper
 	mov	r0, r2			@ pass address of aborted instruction.
 #ifdef MULTI_PABORT
-	ldr	r4, .LCprocfns
+	ldr	ip, .LCprocfns
 	mov	lr, pc
-	ldr	pc, [r4, #PROCESSOR_PABT_FUNC]
+	ldr	pc, [ip, #PROCESSOR_PABT_FUNC]
 #else
 	bl	CPU_PABORT_HANDLER
 #endif
@@ -67,9 +67,9 @@
 	@ the fault status register in r1.  r9 must be preserved.
 	@
 #ifdef MULTI_DABORT
-	ldr	r4, .LCprocfns
+	ldr	ip, .LCprocfns
 	mov	lr, pc
-	ldr	pc, [r4, #PROCESSOR_DABT_FUNC]
+	ldr	pc, [ip, #PROCESSOR_DABT_FUNC]
 #else
 	bl	CPU_DABORT_HANDLER
 #endif