---

yaml --- r: 69087 b: refs/heads/master c: b9fa3df h: refs/heads/master i: 69085: 53d1826 69083: a7bd7dc 69079: 683cb9e 69071: 205de0d 69055: 84772f8 v: v3
git-mirror · Oct 15, 2007 · 79260a9 · 79260a9
1 parent 9551005
commit 79260a9
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: fad095a7b963d9e914e0cdb73e27355c47709441
+refs/heads/master: b9fa3df33f9166daf81bfa8253d339f5a7726122
diff --git 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;
 	}
 }