diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 19:30:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 19:30:35 -0500 |
| commit | 9cf93d7b2f4516271ccf5b48f958bd474cf9dd67 (patch) | |
| tree | e743282bdf6b808cc7739c614fc7158609470ace /arch/arm/lib/delay.S | |
| parent | 401221501af4b87b502eca36ece97b4191380082 (diff) | |
| parent | c6bd2328434a3a6f8f6bc6f77f49c12ec966448a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/lib/delay.S')
| -rw-r--r-- | arch/arm/lib/delay.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S index 3c7f7e675dd8..b3fb475b4120 100644 --- a/arch/arm/lib/delay.S +++ b/arch/arm/lib/delay.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
| 12 | .text | 12 | .text |
| 13 | 13 | ||
| 14 | LC0: .word loops_per_jiffy | 14 | .LC0: .word loops_per_jiffy |
| 15 | 15 | ||
| 16 | /* | 16 | /* |
| 17 | * 0 <= r0 <= 2000 | 17 | * 0 <= r0 <= 2000 |
| @@ -21,7 +21,7 @@ ENTRY(__udelay) | |||
| 21 | orr r2, r2, #0x00db | 21 | orr r2, r2, #0x00db |
| 22 | mul r0, r2, r0 | 22 | mul r0, r2, r0 |
| 23 | ENTRY(__const_udelay) @ 0 <= r0 <= 0x01ffffff | 23 | ENTRY(__const_udelay) @ 0 <= r0 <= 0x01ffffff |
| 24 | ldr r2, LC0 | 24 | ldr r2, .LC0 |
| 25 | ldr r2, [r2] @ max = 0x0fffffff | 25 | ldr r2, [r2] @ max = 0x0fffffff |
| 26 | mov r0, r0, lsr #11 @ max = 0x00003fff | 26 | mov r0, r0, lsr #11 @ max = 0x00003fff |
| 27 | mov r2, r2, lsr #11 @ max = 0x0003ffff | 27 | mov r2, r2, lsr #11 @ max = 0x0003ffff |