diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 08:02:57 +0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 08:02:57 +0400 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /arch/x86/include/asm/delay.h | |
| parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
| parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
| download | linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.xz | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'arch/x86/include/asm/delay.h')
| -rw-r--r-- | arch/x86/include/asm/delay.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/arch/x86/include/asm/delay.h b/arch/x86/include/asm/delay.h index 409a649204aa..9b3b4f2754c7 100644 --- a/arch/x86/include/asm/delay.h +++ b/arch/x86/include/asm/delay.h @@ -1,30 +1,7 @@ #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 xloops); -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)) +#include <asm-generic/delay.h> void use_tsc_delay(void); |