From e3e7807fd4a3224762a7e4912d3512d5f5b9a90e Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 3 Oct 2008 11:09:10 +0100 Subject: [PATCH] --- yaml --- r: 112322 b: refs/heads/master c: 000b50259271c9c14f6e175795f5164e1d51d35b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/compressed/head.S | 2 +- trunk/arch/arm/mm/proc-v7.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1f2d758c7169..20cdc993555a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3319f5e51a20f3e3c59ed7dac9fc2d5c89aa2d9f +refs/heads/master: 000b50259271c9c14f6e175795f5164e1d51d35b diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index 1f1729b76d01..84a1e0496a3c 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -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: diff --git a/trunk/arch/arm/mm/proc-v7.S b/trunk/arch/arm/mm/proc-v7.S index dff967784626..a67e26f3dce2 100644 --- a/trunk/arch/arm/mm/proc-v7.S +++ b/trunk/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)