diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 12:19:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 12:19:13 +0200 |
| commit | 361833efac4d277d209008e1e0658e597bc1bdef (patch) | |
| tree | ef3b3f3bbe274f1e59cc1521566a85584777ace7 /kernel/time/tick-sched.c | |
| parent | 54ef76f37bcccf8c16fbaaed13c3c40825195958 (diff) | |
| parent | c300ba252829e9325e08f0af60687add94445b25 (diff) | |
| download | linux-361833efac4d277d209008e1e0658e597bc1bdef.tar.gz linux-361833efac4d277d209008e1e0658e597bc1bdef.tar.bz2 linux-361833efac4d277d209008e1e0658e597bc1bdef.zip | |
Merge branch 'sched/clock' into sched/devel
Diffstat (limited to 'kernel/time/tick-sched.c')
| -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 b854a895591e..d63008b09a4c 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); /* |