---

yaml --- r: 223997 b: refs/heads/master c: 70caf8a h: refs/heads/master i: 223995: cd03ad3 v: v3
git-mirror · Nov 23, 2010 · 10868aa · 10868aa
1 parent a9e6e1d
commit 10868aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28d0686cf7b14e30243096bd874d3f80591ed392
+refs/heads/master: 70caf8a6c13c2279b35f2ad6b644815533d6c476
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -562,7 +562,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr,
 	curr->vruntime += delta_exec_weighted;
 	update_min_vruntime(cfs_rq);
 
-#ifdef CONFIG_FAIR_GROUP_SCHED
+#if defined CONFIG_SMP && defined CONFIG_FAIR_GROUP_SCHED
 	cfs_rq->load_unacc_exec_time += delta_exec;
 	if (cfs_rq->load_unacc_exec_time > sysctl_sched_shares_window) {
 		update_cfs_load(cfs_rq, 0);