Merge branch 'linus' into timers/nohz

2008-07-18 19:53:16 +02:00
parent b8f8c3cf0a 5b664cb235
commit 9b610fda0d
4958 changed files with 298069 additions and 304351 deletions
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -289,6 +289,7 @@ 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);
 		}

 		/*
@@ -391,6 +392,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);

 	/*