Merge commit 'origin' into devel

[sfrench/cifs-2.6.git] / arch / sh / kernel / timers / timer-mtu2.c

diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index fffcd1c098733b8a2a0bfd36fa6d16f2087a1217..fe453c01f9c9d533ab4d3fd5e4e1356c4bba6aa8 100644 (file)
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -76,7 +76,7 @@ static unsigned long mtu2_timer_get_offset(void)
                                count -= LATCH;
                        } else {
                                printk("%s (): hardware timer problem?\n",
-                                      __FUNCTION__);
+                                      __func__);
                        }
                }
        } else
@@ -100,9 +100,7 @@ static irqreturn_t mtu2_timer_interrupt(int irq, void *dev_id)
        ctrl_outb(timer_status, MTU2_TSR_1);
 
        /* Do timer tick */
-       write_seqlock(&xtime_lock);
        handle_timer_tick();
-       write_sequnlock(&xtime_lock);
 
        return IRQ_HANDLED;
 }
@@ -110,7 +108,7 @@ static irqreturn_t mtu2_timer_interrupt(int irq, void *dev_id)
 static struct irqaction mtu2_irq = {
        .name           = "timer",
        .handler        = mtu2_timer_interrupt,
-       .flags          = IRQF_DISABLED | IRQF_TIMER,
+       .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
        .mask           = CPU_MASK_NONE,
 };
 
@@ -156,7 +154,6 @@ static int mtu2_timer_stop(void)
 
 static int mtu2_timer_init(void)
 {
-       u8 tmp;
        unsigned long interval;
 
        setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);