[ARM] 5229/3: Replace some ARMv7 opcodes with the instruction name
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 3 Oct 2008 10:09:10 +0000 (11:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 3 Oct 2008 10:32:09 +0000 (11:32 +0100)
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>
arch/arm/boot/compressed/head.S
arch/arm/mm/proc-v7.S

index 1f1729b76d0198818d0bdbd856ca45d0c3e03993..84a1e0496a3c6ffb7b1adbfa38182341ca943c27 100644 (file)
@@ -802,7 +802,7 @@ loop1:
                add     r2, r2, #4              @ add 4 (line length offset)
                ldr     r4, =0x3ff
                ands    r4, r4, r1, lsr #3      @ find maximum number on the way size
-               .word   0xe16f5f14              @ clz r5, r4 - find bit position of way size increment
+               clz     r5, r4                  @ find bit position of way size increment
                ldr     r7, =0x7fff
                ands    r7, r7, r1, lsr #13     @ extract max number of the index size
 loop2:
index dff967784626c8f2d1927d512909634a07083154..a67e26f3dce2a87ad9edaa7cf45dba2449cff3f1 100644 (file)
@@ -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)