summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-28 12:18:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-28 12:18:02 -0700
commitcf91b415c8419513ada650a932bfb32a526d4d98 (patch)
treeb69cc7920d763b07fa0722edf58813dc17206734 /kernel
parente6cb6281ef8547fea1243b1c2a4e0f08d9b86ae1 (diff)
parent3310d4d38fbc514e7b18bd3b1eea8effdd63b5aa (diff)
downloadlinux-stable-cf91b415c8419513ada650a932bfb32a526d4d98.tar.gz
linux-stable-cf91b415c8419513ada650a932bfb32a526d4d98.tar.bz2
linux-stable-cf91b415c8419513ada650a932bfb32a526d4d98.zip
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: nohz: Fix nohz ratelimit
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/tick-sched.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 1d7b9bc1c034..783fbadf2202 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -315,9 +315,6 @@ void tick_nohz_stop_sched_tick(int inidle)
goto end;
}
- if (nohz_ratelimit(cpu))
- goto end;
-
ts->idle_calls++;
/* Read jiffies and the time when jiffies were updated last */
do {
@@ -328,7 +325,7 @@ void tick_nohz_stop_sched_tick(int inidle)
} while (read_seqretry(&xtime_lock, seq));
if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu) ||
- arch_needs_cpu(cpu)) {
+ arch_needs_cpu(cpu) || nohz_ratelimit(cpu)) {
next_jiffies = last_jiffies + 1;
delta_jiffies = 1;
} else {