diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:02 +0200 |
| commit | d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8 (patch) | |
| tree | 38cead29b9b34b9d26b5cfe7b2c2673d6f7ac052 /kernel/time | |
| parent | d59fdcf2ac501de99c3dfb452af5e254d4342886 (diff) | |
| parent | 873a6ed6288b6c2c0d2cc84d3b2bf2fab9ba0181 (diff) | |
| download | kernel_samsung_smdk4412-d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8.tar.gz kernel_samsung_smdk4412-d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8.tar.bz2 kernel_samsung_smdk4412-d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8.zip | |
Merge branch 'sched/for-linus' into tracing/for-linus
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index b854a895591..d63008b09a4 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -276,6 +276,7 @@ void tick_nohz_stop_sched_tick(void) ts->tick_stopped = 1; ts->idle_jiffies = last_jiffies; rcu_enter_nohz(); + sched_clock_tick_stop(cpu); } /* @@ -375,6 +376,7 @@ void tick_nohz_restart_sched_tick(void) select_nohz_load_balancer(0); now = ktime_get(); tick_do_update_jiffies64(now); + sched_clock_tick_start(cpu); cpu_clear(cpu, nohz_cpu_mask); /* |