---

yaml --- r: 169902 b: refs/heads/master c: 36ace27 h: refs/heads/master v: v3
git-mirror · Nov 24, 2009 · 653964c · 653964c
1 parent 9b63edb
commit 653964c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 429947248f814e90f416ab4f68a871ab628000c3
+refs/heads/master: 36ace27e3e60d44ea69ce394b2e45386ae98d9d9
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -1704,7 +1704,7 @@ static struct task_struct *pick_next_task_fair(struct rq *rq)
 	struct cfs_rq *cfs_rq = &rq->cfs;
 	struct sched_entity *se;
 
-	if (unlikely(!cfs_rq->nr_running))
+	if (!cfs_rq->nr_running)
 		return NULL;
 
 	do {