aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-arm925.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-07-03 12:44:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-03 12:44:30 +0100
commit906243d07b8bfebeaa05b5aeaa0e5ab2d4034954 (patch)
treef09f41c206a40a74954a8bdb06d3a049e3ed16ab /arch/arm/mm/proc-arm925.S
parent00eb0f6b6595107dd8be80d1af2220cedb71130d (diff)
[ARM] Fix bad asm instruction in proc-arm925.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/proc-arm925.S')
-rw-r--r--arch/arm/mm/proc-arm925.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index ad15f8503d5..8d9a9f93b01 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