summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2008-10-03 12:09:10 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-03 12:32:09 +0200
commit000b50259271c9c14f6e175795f5164e1d51d35b (patch)
treed6c5cde5c74cb84e8ad4d3dc5beefdd131c0c010 /arch/arm/mm
parent[ARM] 5274/1: simplify request_standard_resources() (diff)
downloadlinux-000b50259271c9c14f6e175795f5164e1d51d35b.tar.xz
linux-000b50259271c9c14f6e175795f5164e1d51d35b.zip
[ARM] 5229/3: Replace some ARMv7 opcodes with the instruction name
These instructions were placed in the code directly as opcodes because early compilers didn't support them. Toolchains supporting ARMv7 understand these instructions and the patch puts the mnemonics back. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/proc-v7.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index dff967784626..a67e26f3dce2 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -55,7 +55,7 @@ ENDPROC(cpu_v7_reset)
* IRQs are already disabled.
*/
ENTRY(cpu_v7_do_idle)
- .long 0xe320f003 @ ARM V7 WFI instruction
+ wfi
mov pc, lr
ENDPROC(cpu_v7_do_idle)