diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-12 00:07:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-12 00:07:02 +0200 |
| commit | e26b33e9552c29c1d3fe67dc602c6264c29f5dc7 (patch) | |
| tree | 98f99cedc86db77665d1a3b582444b9049aacc58 /kernel/time | |
| parent | 279ef6bbb8308488398c8f33b04c760148428378 (diff) | |
| parent | cf206bffbb7542df54043fad9898113172af99d8 (diff) | |
| download | talos-op-linux-e26b33e9552c29c1d3fe67dc602c6264c29f5dc7.tar.gz talos-op-linux-e26b33e9552c29c1d3fe67dc602c6264c29f5dc7.zip | |
Merge branch 'sched/clock' into sched/urgent
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 825b4c00fe44..f5da526424a9 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -289,7 +289,6 @@ void tick_nohz_stop_sched_tick(int inidle) ts->tick_stopped = 1; ts->idle_jiffies = last_jiffies; rcu_enter_nohz(); - sched_clock_tick_stop(cpu); } /* @@ -392,7 +391,6 @@ 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); /* |
