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]
/
include
/
asm-x86_64
/
delay.h
diff --git
a/include/asm-x86_64/delay.h
b/include/asm-x86_64/delay.h
index
65f64ac
..
c2669f1
100644
(file)
--- a/
include/asm-x86_64/delay.h
+++ b/
include/asm-x86_64/delay.h
@@
-7,18
+7,21
@@
* Delay routines calling functions in arch/x86_64/lib/delay.c
*/
* Delay routines calling functions in arch/x86_64/lib/delay.c
*/
+/* Undefined functions to get compile-time errors */
extern void __bad_udelay(void);
extern void __bad_ndelay(void);
extern void __udelay(unsigned long usecs);
extern void __bad_udelay(void);
extern void __bad_ndelay(void);
extern void __udelay(unsigned long usecs);
-extern void __ndelay(unsigned long
u
secs);
+extern void __ndelay(unsigned long
n
secs);
extern void __const_udelay(unsigned long usecs);
extern void __delay(unsigned long loops);
extern void __const_udelay(unsigned long usecs);
extern void __delay(unsigned long loops);
+/* 0x10c7 is 2**32 / 1000000 (rounded up) */
#define udelay(n) (__builtin_constant_p(n) ? \
#define udelay(n) (__builtin_constant_p(n) ? \
- ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c
6
ul)) : \
+ ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c
7
ul)) : \
__udelay(n))
__udelay(n))
+/* 0x5 is 2**32 / 1000000000 (rounded up) */
#define ndelay(n) (__builtin_constant_p(n) ? \
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
__ndelay(n))
#define ndelay(n) (__builtin_constant_p(n) ? \
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
__ndelay(n))