Skip to content

Commit

Permalink
[ARM] Fix bad asm instruction in proc-arm925.S
Browse files Browse the repository at this point in the history
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Jul 3, 2006
1 parent 00eb0f6 commit 906243d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/mm/proc-arm925.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 906243d

Please sign in to comment.