aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/delay_32.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-15 23:28:20 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 20:17:17 +0200
commitf1ea05466a13c4fbae852f2ce87aada594f3134f (patch)
tree83f0d94bf8e34d47159326e954d5a2a51f50c953 /include/asm-x86/delay_32.h
parentx86: unify include/asm/cache_32/64.h (diff)
downloadlinux-dev-f1ea05466a13c4fbae852f2ce87aada594f3134f.tar.xz
linux-dev-f1ea05466a13c4fbae852f2ce87aada594f3134f.zip
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_32.h')
-rw-r--r--include/asm-x86/delay_32.h31
1 files changed, 0 insertions, 31 deletions
diff --git a/include/asm-x86/delay_32.h b/include/asm-x86/delay_32.h
deleted file mode 100644
index 9ae5e3782ed8..000000000000
--- a/include/asm-x86/delay_32.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _I386_DELAY_H
-#define _I386_DELAY_H
-
-/*
- * Copyright (C) 1993 Linus Torvalds
- *
- * Delay routines calling functions in arch/i386/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 /* defined(_I386_DELAY_H) */