projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/printk...
[linux-2.6-block.git]
/
kernel
/
time
/
tick-sched.c
diff --git
a/kernel/time/tick-sched.c
b/kernel/time/tick-sched.c
index a4d2193981675aa7b5e2048bf229d5dbdbeccdcd..b711ffcb106c906be19eab01140ec1e8cafd0063 100644
(file)
--- a/
kernel/time/tick-sched.c
+++ b/
kernel/time/tick-sched.c
@@
-270,7
+270,7
@@
void tick_nohz_stop_sched_tick(int inidle)
next_jiffies = get_next_timer_interrupt(last_jiffies);
delta_jiffies = next_jiffies - last_jiffies;
- if (rcu_needs_cpu(cpu))
+ if (rcu_needs_cpu(cpu)
|| printk_needs_cpu(cpu)
)
delta_jiffies = 1;
/*
* Do not stop the tick, if we are only one off