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)); }