]> err.no Git - linux-2.6/commitdiff
[ARM] Fix bad asm instruction in proc-arm925.S
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 3 Jul 2006 11:44:30 +0000 (12:44 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Jul 2006 11:44:30 +0000 (12:44 +0100)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/proc-arm925.S

index ad15f8503d51b9610bc7575b6254fc5f43f57f76..8d9a9f93b011cc914d407b1b5646289d9eb31483 100644 (file)
@@ -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