[PATCH] timer-irq-driven soft-watchdog, cleanups

[linux-2.6-omap-h63xx.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 4427e725ccddb39605364eb497c29607d4cfbc17..17d956cebcb9dcc7207f637bc512a4ad2d3002e8 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -915,6 +915,7 @@ static void run_timer_softirq(struct softirq_action *h)
 void run_local_timers(void)
 {
        raise_softirq(TIMER_SOFTIRQ);
+       softlockup_tick();
 }
 
 /*
@@ -945,7 +946,6 @@ void do_timer(struct pt_regs *regs)
        /* prevent loading jiffies before storing new jiffies_64 value. */
        barrier();
        update_times();
-       softlockup_tick(regs);
 }
 
 #ifdef __ARCH_WANT_SYS_ALARM