patch-2.4.21 linux-2.4.21/arch/x86_64/lib/delay.c

• Lines: 26
• Date: 2003-06-13 07:51:32.000000000 -0700
• Orig file: linux-2.4.20/arch/x86_64/lib/delay.c
• Orig date: 2002-11-28 15:53:12.000000000 -0800

diff -urN linux-2.4.20/arch/x86_64/lib/delay.c linux-2.4.21/arch/x86_64/lib/delay.c
@@ -19,7 +19,6 @@
 
 void __delay(unsigned long loops)
 {
-#ifndef CONFIG_SIMNOW
 	unsigned long bclock, now;
 	
 	rdtscl(bclock);
@@ -29,7 +28,6 @@
 		rdtscl(now);
 	}
 	while((now-bclock) < loops);
-#endif
 }
 
 inline void __const_udelay(unsigned long xloops)
@@ -41,3 +39,9 @@
 {
 	__const_udelay(usecs * 0x000010c6);  /* 2**32 / 1000000 */
 }
+
+void __ndelay(unsigned long usecs)
+{
+       __const_udelay(usecs * 0x00005);  /* 2**32 / 1000000000 (rounded up) */
+}
+