diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 09:46:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 09:46:29 +0200 |
| commit | 0bcfe75807944106a3aa655a54bb610d62f3a7f5 (patch) | |
| tree | d48d848e09d1bf48fe7fa23e9226f38ef342eed4 /kernel/time | |
| parent | eebef74695e1498e04e5f85be9c6f84bd2e7358a (diff) | |
| parent | 396e894d289d69bacf5acd983c97cd6e21a14c08 (diff) | |
Merge branch 'sched/urgent' into sched/core
Conflicts:
include/linux/sched.h
Merge reason: Add the leftover .35 urgent bits, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 17525cac6cfe..021d2f878f19 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -325,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) || nohz_ratelimit(cpu)) { + arch_needs_cpu(cpu)) { next_jiffies = last_jiffies + 1; delta_jiffies = 1; } else { |