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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
i386
/
lib
/
delay.c
diff --git
a/arch/i386/lib/delay.c
b/arch/i386/lib/delay.c
index
028dd9b
..
97b97af
100644
(file)
--- a/
arch/i386/lib/delay.c
+++ b/
arch/i386/lib/delay.c
@@
-31,15
+31,16
@@
void __delay(unsigned long loops)
inline void __const_udelay(unsigned long xloops)
{
int d0;
inline void __const_udelay(unsigned long xloops)
{
int d0;
+ xloops *= 4;
__asm__("mull %0"
:"=d" (xloops), "=&a" (d0)
__asm__("mull %0"
:"=d" (xloops), "=&a" (d0)
- :"1" (xloops),"0" (current_cpu_data.loops_per_jiffy));
- __delay(
xloops * HZ
);
+ :"1" (xloops),"0" (current_cpu_data.loops_per_jiffy
* (HZ/4)
));
+ __delay(
++xloops
);
}
void __udelay(unsigned long usecs)
{
}
void __udelay(unsigned long usecs)
{
- __const_udelay(usecs * 0x000010c
6); /* 2**32 / 1000000
*/
+ __const_udelay(usecs * 0x000010c
7); /* 2**32 / 1000000 (rounded up)
*/
}
void __ndelay(unsigned long nsecs)
}
void __ndelay(unsigned long nsecs)