diff options
Diffstat (limited to 'include/asm-i386')
-rw-r--r-- | include/asm-i386/delay.h | 8 | ||||
-rw-r--r-- | include/asm-i386/paravirt.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-i386/delay.h b/include/asm-i386/delay.h index 32d6678d0bbf..9ae5e3782ed8 100644 --- a/include/asm-i386/delay.h +++ b/include/asm-i386/delay.h | |||
@@ -16,13 +16,6 @@ extern void __ndelay(unsigned long nsecs); | |||
16 | extern void __const_udelay(unsigned long usecs); | 16 | extern void __const_udelay(unsigned long usecs); |
17 | extern void __delay(unsigned long loops); | 17 | extern void __delay(unsigned long loops); |
18 | 18 | ||
19 | #if defined(CONFIG_PARAVIRT) && !defined(USE_REAL_TIME_DELAY) | ||
20 | #define udelay(n) paravirt_ops.const_udelay((n) * 0x10c7ul) | ||
21 | |||
22 | #define ndelay(n) paravirt_ops.const_udelay((n) * 5ul) | ||
23 | |||
24 | #else /* !PARAVIRT || USE_REAL_TIME_DELAY */ | ||
25 | |||
26 | /* 0x10c7 is 2**32 / 1000000 (rounded up) */ | 19 | /* 0x10c7 is 2**32 / 1000000 (rounded up) */ |
27 | #define udelay(n) (__builtin_constant_p(n) ? \ | 20 | #define udelay(n) (__builtin_constant_p(n) ? \ |
28 | ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \ | 21 | ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \ |
@@ -32,7 +25,6 @@ extern void __delay(unsigned long loops); | |||
32 | #define ndelay(n) (__builtin_constant_p(n) ? \ | 25 | #define ndelay(n) (__builtin_constant_p(n) ? \ |
33 | ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ | 26 | ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ |
34 | __ndelay(n)) | 27 | __ndelay(n)) |
35 | #endif | ||
36 | 28 | ||
37 | void use_tsc_delay(void); | 29 | void use_tsc_delay(void); |
38 | 30 | ||
diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h index e01d895d7379..1e4226a85263 100644 --- a/include/asm-i386/paravirt.h +++ b/include/asm-i386/paravirt.h | |||
@@ -117,7 +117,6 @@ struct paravirt_ops | |||
117 | void (*set_iopl_mask)(unsigned mask); | 117 | void (*set_iopl_mask)(unsigned mask); |
118 | 118 | ||
119 | void (*io_delay)(void); | 119 | void (*io_delay)(void); |
120 | void (*const_udelay)(unsigned long loops); | ||
121 | 120 | ||
122 | #ifdef CONFIG_X86_LOCAL_APIC | 121 | #ifdef CONFIG_X86_LOCAL_APIC |
123 | void (*apic_write)(unsigned long reg, unsigned long v); | 122 | void (*apic_write)(unsigned long reg, unsigned long v); |