From dff69754c5ef2a0a54d6960ce7606a9b98c7d981 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 31 May 2005 18:02:00 +0100
Subject: [PATCH] --- yaml --- r: 2227 b: refs/heads/master c:
 49f680ea7bac5c679fb6374a326a164a3fba07cc h: refs/heads/master i:   2225:
 f4a2f042f0850604abe04085c024ba98af36d229   2223:
 ffabe894b59fa9c5baa6f4378ee896a68040a2ef v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/kernel/entry-armv.S   | 4 +++-
 trunk/arch/arm/kernel/entry-header.S | 7 +++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 63e2fcf6664d..fb6a0c7aa023 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 791be9b976ba621b21745c30a7fca225fada9110
+refs/heads/master: 49f680ea7bac5c679fb6374a326a164a3fba07cc
diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S
index a99e686c0b83..cfb5cf5e48fc 100644
--- a/trunk/arch/arm/kernel/entry-armv.S
+++ b/trunk/arch/arm/kernel/entry-armv.S
@@ -269,6 +269,8 @@ __pabt_svc:
 	.word	__temp_und
 .LCabt:
 	.word	__temp_abt
+.LCcralign:
+	.word	cr_alignment
 #ifdef MULTI_ABORT
 .LCprocfns:
 	.word	processor
@@ -311,7 +313,7 @@ __pabt_svc:
 	@
 	@ Enable the alignment trap while in kernel mode
 	@
-	alignment_trap r7, r0, __temp_\sym
+	alignment_trap r0
 
 	@
 	@ Clear FP to mark the first stack frame
diff --git a/trunk/arch/arm/kernel/entry-header.S b/trunk/arch/arm/kernel/entry-header.S
index a3d40a0e2b04..afef21273963 100644
--- a/trunk/arch/arm/kernel/entry-header.S
+++ b/trunk/arch/arm/kernel/entry-header.S
@@ -59,11 +59,10 @@
 	mov	\rd, \rd, lsl #13
 	.endm
 
-	.macro	alignment_trap, rbase, rtemp, sym
+	.macro	alignment_trap, rtemp
 #ifdef CONFIG_ALIGNMENT_TRAP
-#define OFF_CR_ALIGNMENT(x)	cr_alignment - x
-
-	ldr	\rtemp, [\rbase, #OFF_CR_ALIGNMENT(\sym)]
+	ldr	\rtemp, .LCcralign
+	ldr	\rtemp, [\rtemp]
 	mcr	p15, 0, \rtemp, c1, c0
 #endif
 	.endm