git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
lib
/
delay.S
diff --git
a/arch/arm/lib/delay.S
b/arch/arm/lib/delay.S
index
b3fb475
..
930a702
100644
(file)
--- a/
arch/arm/lib/delay.S
+++ b/
arch/arm/lib/delay.S
@@
-9,28
+9,32
@@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
+#include <asm/param.h>
.text
.LC0: .word loops_per_jiffy
.text
.LC0: .word loops_per_jiffy
+.LC1: .word (2199023*HZ)>>11
/*
/*
- * 0 <= r0 <= 2000
+ * r0 <= 2000
+ * lpj <= 0x01ffffff (max. 3355 bogomips)
+ * HZ <= 1000
*/
*/
+
ENTRY(__udelay)
ENTRY(__udelay)
- mov r2, #0x6800
- orr r2, r2, #0x00db
+ ldr r2, .LC1
mul r0, r2, r0
mul r0, r2, r0
-ENTRY(__const_udelay) @ 0 <= r0 <= 0x
01ffffff
+ENTRY(__const_udelay) @ 0 <= r0 <= 0x
7fffff06
ldr r2, .LC0
ldr r2, .LC0
- ldr r2, [r2] @ max = 0x0
f
ffffff
- mov r0, r0, lsr #1
1 @ max = 0x00003
fff
- mov r2, r2, lsr #1
1 @ max = 0x0003f
fff
+ ldr r2, [r2] @ max = 0x0
1
ffffff
+ mov r0, r0, lsr #1
4 @ max = 0x0001f
fff
+ mov r2, r2, lsr #1
0 @ max = 0x00007
fff
mul r0, r2, r0 @ max = 2^32-1
movs r0, r0, lsr #6
mul r0, r2, r0 @ max = 2^32-1
movs r0, r0, lsr #6
- RETINSTR(moveq,pc,lr)
+ moveq pc, lr
/*
/*
- * loops =
(r0 * 0x10c6 * 100 * loops_per_jiffy) / 2^32
+ * loops =
r0 * HZ * loops_per_jiffy / 1000000
*
* Oh, if only we had a cycle counter...
*/
*
* Oh, if only we had a cycle counter...
*/
@@
-39,20
+43,20
@@
ENTRY(__const_udelay) @ 0 <= r0 <= 0x01ffffff
ENTRY(__delay)
subs r0, r0, #1
#if 0
ENTRY(__delay)
subs r0, r0, #1
#if 0
- RETINSTR(movls,pc,lr)
+ movls pc, lr
subs r0, r0, #1
subs r0, r0, #1
- RETINSTR(movls,pc,lr)
+ movls pc, lr
subs r0, r0, #1
subs r0, r0, #1
- RETINSTR(movls,pc,lr)
+ movls pc, lr
subs r0, r0, #1
subs r0, r0, #1
- RETINSTR(movls,pc,lr)
+ movls pc, lr
subs r0, r0, #1
subs r0, r0, #1
- RETINSTR(movls,pc,lr)
+ movls pc, lr
subs r0, r0, #1
subs r0, r0, #1
- RETINSTR(movls,pc,lr)
+ movls pc, lr
subs r0, r0, #1
subs r0, r0, #1
- RETINSTR(movls,pc,lr)
+ movls pc, lr
subs r0, r0, #1
#endif
bhi __delay
subs r0, r0, #1
#endif
bhi __delay
- RETINSTR(mov,pc,lr)
+ mov pc, lr