diff options
author | Richard Weinberger <richard@nod.at> | 2011-07-25 20:12:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 23:57:12 -0400 |
commit | 22e9b917ab7ccd98046ad9428fb28967f0744605 (patch) | |
tree | fb21871390d662b0c9cccd05ee3180336afe8e4f /arch/um/include | |
parent | c0ce5b673457123406f19e616bb8cf20a0c12cb5 (diff) |
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 @@ | |||
1 | #ifndef __UM_DELAY_H | 1 | #ifndef __UM_DELAY_H |
2 | #define __UM_DELAY_H | 2 | #define __UM_DELAY_H |
3 | 3 | ||
4 | #define MILLION 1000000 | ||
5 | |||
6 | /* Undefined on purpose */ | 4 | /* Undefined on purpose */ |
7 | extern void __bad_udelay(void); | 5 | extern void __bad_udelay(void); |
6 | extern void __bad_ndelay(void); | ||
8 | 7 | ||
9 | extern void __udelay(unsigned long usecs); | 8 | extern void __udelay(unsigned long usecs); |
9 | extern void __ndelay(unsigned long usecs); | ||
10 | extern void __delay(unsigned long loops); | 10 | extern void __delay(unsigned long loops); |
11 | 11 | ||
12 | #define udelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \ | 12 | #define udelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \ |
13 | __bad_udelay() : __udelay(n)) | 13 | __bad_udelay() : __udelay(n)) |
14 | 14 | ||
15 | /* It appears that ndelay is not used at all for UML, and has never been | 15 | #define ndelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \ |
16 | * implemented. */ | 16 | __bad_ndelay() : __ndelay(n)) |
17 | extern void __unimplemented_ndelay(void); | ||
18 | #define ndelay(n) __unimplemented_ndelay() | ||
19 | 17 | ||
20 | #endif | 18 | #endif |