From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 3 Jul 2006 11:44:30 +0000 (+0100)
Subject: [ARM] Fix bad asm instruction in proc-arm925.S
X-Git-Tag: v2.6.18-rc1~19^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=906243d07b8bfebeaa05b5aeaa0e5ab2d4034954;p=linux-2.6

[ARM] Fix bad asm instruction in proc-arm925.S

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index ad15f8503d..8d9a9f93b0 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -454,7 +454,8 @@ __arm925_setup:
 	mcr	p15, 7, r0, c15, c0, 0
 #endif
 
-	adr	r5, {r5, r6}
+	adr	r5, arm925_crval
+	ldmia	r5, {r5, r6}
 	mrc	p15, 0, r0, c1, c0		@ get control register v4
 	bic	r0, r0, r5
 	orr	r0, r0, r6