projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
00eb0f6
)
[ARM] Fix bad asm instruction in proc-arm925.S
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Mon, 3 Jul 2006 11:44:30 +0000
(12:44 +0100)
committer
Russell 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
patch
|
blob
|
history
diff --git
a/arch/arm/mm/proc-arm925.S
b/arch/arm/mm/proc-arm925.S
index
ad15f85
..
8d9a9f9
100644
(file)
--- 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