diff --git a/[refs] b/[refs] index a6ae8ffa8911..4745887e7362 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fad095a7b963d9e914e0cdb73e27355c47709441 +refs/heads/master: b9fa3df33f9166daf81bfa8253d339f5a7726122 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 57e7f3672fd7..de13a6f5b977 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -727,6 +727,7 @@ static void enqueue_task_fair(struct rq *rq, struct task_struct *p, int wakeup) break; cfs_rq = cfs_rq_of(se); enqueue_entity(cfs_rq, se, wakeup); + wakeup = 1; } } @@ -746,6 +747,7 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep) /* Don't dequeue parent if it has other entities besides us */ if (cfs_rq->load.weight) break; + sleep = 1; } }