From 5e4e0284fc30e46101344c15adf8618da478643d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 3 Jul 2009 08:44:30 -0500 Subject: [PATCH] timers: mov printk_tick to soft interrupt commit 0dfa3e7ed99d0ccc679c1ed048c88cc18cedc59c in tip. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Paul Gortmaker --- kernel/timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/timer.c b/kernel/timer.c index a081803..c9820fa 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1266,7 +1266,6 @@ void update_process_times(int user_tick) account_process_tick(p, user_tick); run_local_timers(); rcu_check_callbacks(cpu, user_tick); - printk_tick(); perf_event_do_pending(); scheduler_tick(); run_posix_cpu_timers(p); @@ -1279,6 +1278,7 @@ static void run_timer_softirq(struct softirq_action *h) { struct tvec_base *base = __get_cpu_var(tvec_bases); + printk_tick(); hrtimer_run_pending(); if (time_after_eq(jiffies, base->timer_jiffies)) -- 1.7.0.4