diff options
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/timers/timer-cmt.c | 9 | ||||
-rw-r--r-- | arch/sh/kernel/timers/timer-mtu2.c | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c index 499e07beebe2..71312324b5de 100644 --- a/arch/sh/kernel/timers/timer-cmt.c +++ b/arch/sh/kernel/timers/timer-cmt.c | |||
@@ -100,16 +100,7 @@ static irqreturn_t cmt_timer_interrupt(int irq, void *dev_id) | |||
100 | timer_status &= ~0x80; | 100 | timer_status &= ~0x80; |
101 | ctrl_outw(timer_status, CMT_CMCSR_0); | 101 | ctrl_outw(timer_status, CMT_CMCSR_0); |
102 | 102 | ||
103 | /* | ||
104 | * Here we are in the timer irq handler. We just have irqs locally | ||
105 | * disabled but we don't know if the timer_bh is running on the other | ||
106 | * CPU. We need to avoid to SMP race with it. NOTE: we don' t need | ||
107 | * the irq version of write_lock because as just said we have irq | ||
108 | * locally disabled. -arca | ||
109 | */ | ||
110 | write_seqlock(&xtime_lock); | ||
111 | handle_timer_tick(); | 103 | handle_timer_tick(); |
112 | write_sequnlock(&xtime_lock); | ||
113 | 104 | ||
114 | return IRQ_HANDLED; | 105 | return IRQ_HANDLED; |
115 | } | 106 | } |
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c index b7499a2a9188..463cd08f9517 100644 --- a/arch/sh/kernel/timers/timer-mtu2.c +++ b/arch/sh/kernel/timers/timer-mtu2.c | |||
@@ -100,9 +100,7 @@ static irqreturn_t mtu2_timer_interrupt(int irq, void *dev_id) | |||
100 | ctrl_outb(timer_status, MTU2_TSR_1); | 100 | ctrl_outb(timer_status, MTU2_TSR_1); |
101 | 101 | ||
102 | /* Do timer tick */ | 102 | /* Do timer tick */ |
103 | write_seqlock(&xtime_lock); | ||
104 | handle_timer_tick(); | 103 | handle_timer_tick(); |
105 | write_sequnlock(&xtime_lock); | ||
106 | 104 | ||
107 | return IRQ_HANDLED; | 105 | return IRQ_HANDLED; |
108 | } | 106 | } |