From cf1732916c332574d5a34236ac2e2bf71f78a6a9 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Wed, 26 Jan 2011 13:36:03 +0100
Subject: [PATCH] --- yaml --- r: 234547 b: refs/heads/master c:
 6ea72f12069306b235151c5b05ac0cca7e1dedfa h: refs/heads/master i:   234545:
 c9cd22759d953c39167697dc5cbf33e3c75e5707   234543:
 9d4c419d8cbfdde8b6d600f7740948ba8209e9fb v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 52a66ee6c84f..f3bcbf4b1d5d 100644
--- 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
index 78fa75394011..477e1bcc63f9 100644
--- 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));
 }