---

yaml --- r: 234547 b: refs/heads/master c: 6ea72f1 h: refs/heads/master i: 234545: c9cd227 234543: 9d4c419 v: v3
git-mirror · Jan 27, 2011 · cf17329 · cf17329
1 parent 16fb3d8
commit cf17329
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da7a735e51f9622eb3e1672594d4a41da01d7e4f
+refs/heads/master: 6ea72f12069306b235151c5b05ac0cca7e1dedfa
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -7922,7 +7922,9 @@ static void init_cfs_rq(struct cfs_rq *cfs_rq, struct rq *rq)
 #ifdef CONFIG_FAIR_GROUP_SCHED
 	cfs_rq->rq = rq;
 	/* allow initial update_cfs_load() to truncate */
+#ifdef CONFIG_SMP
 	cfs_rq->load_stamp = 1;
+#endif
 #endif
 	cfs_rq->min_vruntime = (u64)(-(1LL << 20));
 }