X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ftimer.c;h=f739dfb539cec7dd1f6c737b9b6fccfe017aebf8;hb=3ba5619f06300cd0944150901ed20de87483ad8c;hp=2a00c22203f30179296211bcacb7697f27c5e18c;hpb=2d94dfc8c38edf63e91e48fd55c3a8822b6a9ced;p=linux-2.6

diff --git a/kernel/timer.c b/kernel/timer.c
index 2a00c22203..f739dfb539 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -896,7 +896,7 @@ static void run_timer_softirq(struct softirq_action *h)
 {
 	tvec_base_t *base = __get_cpu_var(tvec_bases);
 
-	hrtimer_run_queues();
+	hrtimer_run_pending();
 
 	if (time_after_eq(jiffies, base->timer_jiffies))
 		__run_timers(base);
@@ -907,6 +907,7 @@ static void run_timer_softirq(struct softirq_action *h)
  */
 void run_local_timers(void)
 {
+	hrtimer_run_queues();
 	raise_softirq(TIMER_SOFTIRQ);
 	softlockup_tick();
 }