From 79260a9c59780e142ebbc78da799b199df57567c Mon Sep 17 00:00:00 2001 From: Srivatsa Vaddagiri Date: Mon, 15 Oct 2007 17:00:12 +0200 Subject: [PATCH] --- yaml --- r: 69087 b: refs/heads/master c: b9fa3df33f9166daf81bfa8253d339f5a7726122 h: refs/heads/master i: 69085: 53d18266d03a8fa377e1760090148ba5f68fed30 69083: a7bd7dcd925b77e386feae48197698f2e75c437a 69079: 683cb9e243322dab52c6e2db8878c0ba3029013b 69071: 205de0d588fe86fe8a9321a7fd1d4cbdeaae50e6 69055: 84772f8a68a90846d7d56df7d17705a7d6efd929 v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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; } }