Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 112322
b: refs/heads/master
c: 000b502
h: refs/heads/master
v: v3
  • Loading branch information
Catalin Marinas authored and Russell King committed Oct 3, 2008
1 parent c7cbed7 commit e3e7807
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3319f5e51a20f3e3c59ed7dac9fc2d5c89aa2d9f
refs/heads/master: 000b50259271c9c14f6e175795f5164e1d51d35b
2 changes: 1 addition & 1 deletion trunk/arch/arm/boot/compressed/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mm/proc-v7.S
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit e3e7807

Please sign in to comment.