diff options
| author | Ingo Molnar | 2011-10-01 14:21:36 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2011-10-01 14:21:36 +0200 |
| commit | 048b718029033af117870d3da47da12995be14a3 (patch) | |
| tree | b3d4bf5219cd6543c35cb79d1aa08ae98cf2a8af /kernel/time | |
| parent | Resource: fix wrong resource window calculation (diff) | |
| parent | rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp() (diff) | |
| download | kernel-qcow2-linux-048b718029033af117870d3da47da12995be14a3.tar.gz kernel-qcow2-linux-048b718029033af117870d3da47da12995be14a3.tar.xz kernel-qcow2-linux-048b718029033af117870d3da47da12995be14a3.zip | |
Merge branch 'rcu/next' of git://github.com/paulmckrcu/linux into core/rcu
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index d5097c44b407..eb98e55196b9 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -139,7 +139,6 @@ static void tick_nohz_update_jiffies(ktime_t now) struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu); unsigned long flags; - cpumask_clear_cpu(cpu, nohz_cpu_mask); ts->idle_waketime = now; local_irq_save(flags); @@ -389,9 +388,6 @@ void tick_nohz_stop_sched_tick(int inidle) else expires.tv64 = KTIME_MAX; - if (delta_jiffies > 1) - cpumask_set_cpu(cpu, nohz_cpu_mask); - /* Skip reprogram of event if its not changed */ if (ts->tick_stopped && ktime_equal(expires, dev->next_event)) goto out; @@ -441,7 +437,6 @@ void tick_nohz_stop_sched_tick(int inidle) * softirq. */ tick_do_update_jiffies64(ktime_get()); - cpumask_clear_cpu(cpu, nohz_cpu_mask); } raise_softirq_irqoff(TIMER_SOFTIRQ); out: @@ -524,7 +519,6 @@ void tick_nohz_restart_sched_tick(void) /* Update jiffies first */ select_nohz_load_balancer(0); tick_do_update_jiffies64(now); - cpumask_clear_cpu(cpu, nohz_cpu_mask); #ifndef CONFIG_VIRT_CPU_ACCOUNTING /* |