diff options
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 1f1729b76d01..84a1e0496a3c 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -802,7 +802,7 @@ loop1: | |||
| 802 | add r2, r2, #4 @ add 4 (line length offset) | 802 | add r2, r2, #4 @ add 4 (line length offset) |
| 803 | ldr r4, =0x3ff | 803 | ldr r4, =0x3ff |
| 804 | ands r4, r4, r1, lsr #3 @ find maximum number on the way size | 804 | ands r4, r4, r1, lsr #3 @ find maximum number on the way size |
| 805 | .word 0xe16f5f14 @ clz r5, r4 - find bit position of way size increment | 805 | clz r5, r4 @ find bit position of way size increment |
| 806 | ldr r7, =0x7fff | 806 | ldr r7, =0x7fff |
| 807 | ands r7, r7, r1, lsr #13 @ extract max number of the index size | 807 | ands r7, r7, r1, lsr #13 @ extract max number of the index size |
| 808 | loop2: | 808 | loop2: |
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) | |||
| 55 | * IRQs are already disabled. | 55 | * IRQs are already disabled. |
| 56 | */ | 56 | */ |
| 57 | ENTRY(cpu_v7_do_idle) | 57 | ENTRY(cpu_v7_do_idle) |
| 58 | .long 0xe320f003 @ ARM V7 WFI instruction | 58 | wfi |
| 59 | mov pc, lr | 59 | mov pc, lr |
| 60 | ENDPROC(cpu_v7_do_idle) | 60 | ENDPROC(cpu_v7_do_idle) |
| 61 | 61 | ||