Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne…

…l/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, tsc: Fix a preemption leak in restore_sched_clock_state() sched: Move sched_avg_update() to update_cpu_load()

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, tsc: Fix a preemption leak in restore_sched_clock_state() sched: Move sched_avg_update() to update_cpu_load()
Linus Torvalds
2 parents 3e6dce76d9 55496c896b
Showing 2 changed files Side-by-side Diff
kernel/sched.c
kernel/sched_fair.c
@@ -1294,6 +1294,10 @@
 static void sched_rt_avg_update(struct rq *rq, u64 rt_delta)
 {
 }
+
+static void sched_avg_update(struct rq *rq)
+{
+}
 #endif /* CONFIG_SMP */
  
 #if BITS_PER_LONG == 32
@@ -3182,6 +3186,8 @@
  
 		this_rq->cpu_load[i] = (old_load * (scale - 1) + new_load) >> i;
 	}
+
+	sched_avg_update(this_rq);
 }
  
 static void update_cpu_load_active(struct rq *this_rq)
@@ -2267,8 +2267,6 @@
 	struct rq *rq = cpu_rq(cpu);
 	u64 total, available;
  
-	sched_avg_update(rq);
-
 	total = sched_avg_period() + (rq->clock - rq->age_stamp);
 	available = total - rq->rt_avg;
...	...	@@ -1294,6 +1294,10 @@
1294	1294	static void sched_rt_avg_update(struct rq *rq, u64 rt_delta)
1295	1295	{
1296	1296	}
	1297	+
	1298	+static void sched_avg_update(struct rq *rq)
	1299	+{
	1300	+}
1297	1301	#endif /* CONFIG_SMP */
1298	1302
1299	1303	#if BITS_PER_LONG == 32
...	...	@@ -3182,6 +3186,8 @@
3182	3186
3183	3187	this_rq->cpu_load[i] = (old_load * (scale - 1) + new_load) >> i;
3184	3188	}
	3189	+
	3190	+ sched_avg_update(this_rq);
3185	3191	}
3186	3192
3187	3193	static void update_cpu_load_active(struct rq *this_rq)
...	...	@@ -2267,8 +2267,6 @@
2267	2267	struct rq *rq = cpu_rq(cpu);
2268	2268	u64 total, available;
2269	2269
2270		- sched_avg_update(rq);
2271		-
2272	2270	total = sched_avg_period() + (rq->clock - rq->age_stamp);
2273	2271	available = total - rq->rt_avg;
2274	2272