diff options
| author | Richard Weinberger <richard@nod.at> | 2011-07-25 17:12:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 20:57:12 -0700 |
| commit | 22e9b917ab7ccd98046ad9428fb28967f0744605 (patch) | |
| tree | fb21871390d662b0c9cccd05ee3180336afe8e4f /arch/um/include | |
| parent | c0ce5b673457123406f19e616bb8cf20a0c12cb5 (diff) | |
| download | blackbird-op-linux-22e9b917ab7ccd98046ad9428fb28967f0744605.tar.gz blackbird-op-linux-22e9b917ab7ccd98046ad9428fb28967f0744605.zip | |
um: clean up delay functions
Both sys-i386 and sys-x86_64 support now ndelay(). The delay functions
are based on arch/x86/lib/delay.c.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/asm/delay.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/um/include/asm/delay.h b/arch/um/include/asm/delay.h index c71e32b6741e..8a5576d8eda5 100644 --- a/arch/um/include/asm/delay.h +++ b/arch/um/include/asm/delay.h @@ -1,20 +1,18 @@ #ifndef __UM_DELAY_H #define __UM_DELAY_H -#define MILLION 1000000 - /* Undefined on purpose */ extern void __bad_udelay(void); +extern void __bad_ndelay(void); extern void __udelay(unsigned long usecs); +extern void __ndelay(unsigned long usecs); extern void __delay(unsigned long loops); #define udelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \ __bad_udelay() : __udelay(n)) -/* It appears that ndelay is not used at all for UML, and has never been - * implemented. */ -extern void __unimplemented_ndelay(void); -#define ndelay(n) __unimplemented_ndelay() +#define ndelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \ + __bad_ndelay() : __ndelay(n)) #endif |
