mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
[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>
This commit is contained in:
parent
3319f5e51a
commit
000b502592
2 changed files with 2 additions and 2 deletions
|
@ -802,7 +802,7 @@ loop1:
|
||||||
add r2, r2, #4 @ add 4 (line length offset)
|
add r2, r2, #4 @ add 4 (line length offset)
|
||||||
ldr r4, =0x3ff
|
ldr r4, =0x3ff
|
||||||
ands r4, r4, r1, lsr #3 @ find maximum number on the way size
|
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
|
ldr r7, =0x7fff
|
||||||
ands r7, r7, r1, lsr #13 @ extract max number of the index size
|
ands r7, r7, r1, lsr #13 @ extract max number of the index size
|
||||||
loop2:
|
loop2:
|
||||||
|
|
|
@ -55,7 +55,7 @@ ENDPROC(cpu_v7_reset)
|
||||||
* IRQs are already disabled.
|
* IRQs are already disabled.
|
||||||
*/
|
*/
|
||||||
ENTRY(cpu_v7_do_idle)
|
ENTRY(cpu_v7_do_idle)
|
||||||
.long 0xe320f003 @ ARM V7 WFI instruction
|
wfi
|
||||||
mov pc, lr
|
mov pc, lr
|
||||||
ENDPROC(cpu_v7_do_idle)
|
ENDPROC(cpu_v7_do_idle)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue