diff options
Diffstat (limited to 'arch/x86/kernel/i8253.c')
| -rw-r--r-- | arch/x86/kernel/i8253.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index 23c167925a5c..2dfd31597443 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <asm/hpet.h> | 16 | #include <asm/hpet.h> |
| 17 | #include <asm/smp.h> | 17 | #include <asm/smp.h> |
| 18 | 18 | ||
| 19 | DEFINE_SPINLOCK(i8253_lock); | 19 | DEFINE_RAW_SPINLOCK(i8253_lock); |
| 20 | EXPORT_SYMBOL(i8253_lock); | 20 | EXPORT_SYMBOL(i8253_lock); |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
| @@ -33,7 +33,7 @@ struct clock_event_device *global_clock_event; | |||
| 33 | static void init_pit_timer(enum clock_event_mode mode, | 33 | static void init_pit_timer(enum clock_event_mode mode, |
| 34 | struct clock_event_device *evt) | 34 | struct clock_event_device *evt) |
| 35 | { | 35 | { |
| 36 | spin_lock(&i8253_lock); | 36 | raw_spin_lock(&i8253_lock); |
| 37 | 37 | ||
| 38 | switch (mode) { | 38 | switch (mode) { |
| 39 | case CLOCK_EVT_MODE_PERIODIC: | 39 | case CLOCK_EVT_MODE_PERIODIC: |
| @@ -62,7 +62,7 @@ static void init_pit_timer(enum clock_event_mode mode, | |||
| 62 | /* Nothing to do here */ | 62 | /* Nothing to do here */ |
| 63 | break; | 63 | break; |
| 64 | } | 64 | } |
| 65 | spin_unlock(&i8253_lock); | 65 | raw_spin_unlock(&i8253_lock); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | /* | 68 | /* |
| @@ -72,10 +72,10 @@ static void init_pit_timer(enum clock_event_mode mode, | |||
| 72 | */ | 72 | */ |
| 73 | static int pit_next_event(unsigned long delta, struct clock_event_device *evt) | 73 | static int pit_next_event(unsigned long delta, struct clock_event_device *evt) |
| 74 | { | 74 | { |
| 75 | spin_lock(&i8253_lock); | 75 | raw_spin_lock(&i8253_lock); |
| 76 | outb_pit(delta & 0xff , PIT_CH0); /* LSB */ | 76 | outb_pit(delta & 0xff , PIT_CH0); /* LSB */ |
| 77 | outb_pit(delta >> 8 , PIT_CH0); /* MSB */ | 77 | outb_pit(delta >> 8 , PIT_CH0); /* MSB */ |
| 78 | spin_unlock(&i8253_lock); | 78 | raw_spin_unlock(&i8253_lock); |
| 79 | 79 | ||
| 80 | return 0; | 80 | return 0; |
| 81 | } | 81 | } |
| @@ -130,7 +130,7 @@ static cycle_t pit_read(struct clocksource *cs) | |||
| 130 | int count; | 130 | int count; |
| 131 | u32 jifs; | 131 | u32 jifs; |
| 132 | 132 | ||
| 133 | spin_lock_irqsave(&i8253_lock, flags); | 133 | raw_spin_lock_irqsave(&i8253_lock, flags); |
| 134 | /* | 134 | /* |
| 135 | * Although our caller may have the read side of xtime_lock, | 135 | * Although our caller may have the read side of xtime_lock, |
| 136 | * this is now a seqlock, and we are cheating in this routine | 136 | * this is now a seqlock, and we are cheating in this routine |
| @@ -176,7 +176,7 @@ static cycle_t pit_read(struct clocksource *cs) | |||
| 176 | old_count = count; | 176 | old_count = count; |
| 177 | old_jifs = jifs; | 177 | old_jifs = jifs; |
| 178 | 178 | ||
| 179 | spin_unlock_irqrestore(&i8253_lock, flags); | 179 | raw_spin_unlock_irqrestore(&i8253_lock, flags); |
| 180 | 180 | ||
| 181 | count = (LATCH - 1) - count; | 181 | count = (LATCH - 1) - count; |
| 182 | 182 | ||
