diff options
| -rw-r--r-- | arch/x86/kernel/i8253.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index 5cf36c053ac4..23c167925a5c 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c | |||
| @@ -19,12 +19,6 @@ | |||
| 19 | DEFINE_SPINLOCK(i8253_lock); | 19 | DEFINE_SPINLOCK(i8253_lock); |
| 20 | EXPORT_SYMBOL(i8253_lock); | 20 | EXPORT_SYMBOL(i8253_lock); |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_X86_32 | ||
| 23 | static void pit_disable_clocksource(void); | ||
| 24 | #else | ||
| 25 | static inline void pit_disable_clocksource(void) { } | ||
| 26 | #endif | ||
| 27 | |||
| 28 | /* | 22 | /* |
| 29 | * HPET replaces the PIT, when enabled. So we need to know, which of | 23 | * HPET replaces the PIT, when enabled. So we need to know, which of |
| 30 | * the two timers is used | 24 | * the two timers is used |
| @@ -57,12 +51,10 @@ static void init_pit_timer(enum clock_event_mode mode, | |||
| 57 | outb_pit(0, PIT_CH0); | 51 | outb_pit(0, PIT_CH0); |
| 58 | outb_pit(0, PIT_CH0); | 52 | outb_pit(0, PIT_CH0); |
| 59 | } | 53 | } |
| 60 | pit_disable_clocksource(); | ||
| 61 | break; | 54 | break; |
| 62 | 55 | ||
| 63 | case CLOCK_EVT_MODE_ONESHOT: | 56 | case CLOCK_EVT_MODE_ONESHOT: |
| 64 | /* One shot setup */ | 57 | /* One shot setup */ |
| 65 | pit_disable_clocksource(); | ||
| 66 | outb_pit(0x38, PIT_MODE); | 58 | outb_pit(0x38, PIT_MODE); |
| 67 | break; | 59 | break; |
| 68 | 60 | ||
| @@ -200,17 +192,6 @@ static struct clocksource pit_cs = { | |||
| 200 | .shift = 20, | 192 | .shift = 20, |
| 201 | }; | 193 | }; |
| 202 | 194 | ||
| 203 | static void pit_disable_clocksource(void) | ||
| 204 | { | ||
| 205 | /* | ||
| 206 | * Use mult to check whether it is registered or not | ||
| 207 | */ | ||
| 208 | if (pit_cs.mult) { | ||
| 209 | clocksource_unregister(&pit_cs); | ||
| 210 | pit_cs.mult = 0; | ||
| 211 | } | ||
| 212 | } | ||
| 213 | |||
| 214 | static int __init init_pit_clocksource(void) | 195 | static int __init init_pit_clocksource(void) |
| 215 | { | 196 | { |
| 216 | /* | 197 | /* |
