aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2008-08-08 15:47:09 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-11 07:46:53 -0400
commitb845b517b5e3706a3729f6ea83b88ab85f0725b0 (patch)
tree4311e4c2e6c3fdbdbe89149d1501944294186455 /kernel/time
parent796aadeb1b2db9b5d463946766c5bbfd7717158c (diff)
printk: robustify printk
Avoid deadlocks against rq->lock and xtime_lock by deferring the klogd wakeup by polling from the timer tick. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 825b4c00fe44..c13d4f182370 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -255,7 +255,7 @@ void tick_nohz_stop_sched_tick(int inidle)
255 next_jiffies = get_next_timer_interrupt(last_jiffies); 255 next_jiffies = get_next_timer_interrupt(last_jiffies);
256 delta_jiffies = next_jiffies - last_jiffies; 256 delta_jiffies = next_jiffies - last_jiffies;
257 257
258 if (rcu_needs_cpu(cpu)) 258 if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu))
259 delta_jiffies = 1; 259 delta_jiffies = 1;
260 /* 260 /*
261 * Do not stop the tick, if we are only one off 261 * Do not stop the tick, if we are only one off