diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-16 01:28:20 +0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 22:17:17 +0400 |
| commit | f1ea05466a13c4fbae852f2ce87aada594f3134f (patch) | |
| tree | 83f0d94bf8e34d47159326e954d5a2a51f50c953 /include/asm-x86/delay.h | |
| parent | 9bfa23df5632775bcb70b87975743046a71f7a3b (diff) | |
| download | linux-f1ea05466a13c4fbae852f2ce87aada594f3134f.tar.xz | |
x86: unify include/asm/delay_32/64.h
Same file, except for whitespace, comment formatting and the extra
function prototype usc_tsc_delay() in _32.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/delay.h')
| -rw-r--r-- | include/asm-x86/delay.h | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/include/asm-x86/delay.h b/include/asm-x86/delay.h index 10f2c71d622b..d11d47fc1a0e 100644 --- a/include/asm-x86/delay.h +++ b/include/asm-x86/delay.h @@ -1,5 +1,31 @@ -#ifdef CONFIG_X86_32 -# include "delay_32.h" -#else -# include "delay_64.h" -#endif +#ifndef _ASM_X86_DELAY_H +#define _ASM_X86_DELAY_H + +/* + * Copyright (C) 1993 Linus Torvalds + * + * Delay routines calling functions in arch/x86/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 __ndelay(unsigned long nsecs); +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) ? \ + ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \ + __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)) + +void use_tsc_delay(void); + +#endif /* _ASM_X86_DELAY_H */ |