diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-07-03 07:44:30 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-03 07:44:30 -0400 |
| commit | 906243d07b8bfebeaa05b5aeaa0e5ab2d4034954 (patch) | |
| tree | f09f41c206a40a74954a8bdb06d3a049e3ed16ab /arch | |
| parent | 00eb0f6b6595107dd8be80d1af2220cedb71130d (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')
| -rw-r--r-- | arch/arm/mm/proc-arm925.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S index ad15f8503d51..8d9a9f93b011 100644 --- a/arch/arm/mm/proc-arm925.S +++ b/arch/arm/mm/proc-arm925.S | |||
| @@ -454,7 +454,8 @@ __arm925_setup: | |||
| 454 | mcr p15, 7, r0, c15, c0, 0 | 454 | mcr p15, 7, r0, c15, c0, 0 |
| 455 | #endif | 455 | #endif |
| 456 | 456 | ||
| 457 | adr r5, {r5, r6} | 457 | adr r5, arm925_crval |
| 458 | ldmia r5, {r5, r6} | ||
| 458 | mrc p15, 0, r0, c1, c0 @ get control register v4 | 459 | mrc p15, 0, r0, c1, c0 @ get control register v4 |
| 459 | bic r0, r0, r5 | 460 | bic r0, r0, r5 |
| 460 | orr r0, r0, r6 | 461 | orr r0, r0, r6 |