From 653964cefd9e5e7d9e6d0a23e538aff2290f8390 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Tue, 24 Nov 2009 11:55:45 +0100
Subject: [PATCH] --- yaml --- r: 169902 b: refs/heads/master c:
 36ace27e3e60d44ea69ce394b2e45386ae98d9d9 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 078a219a753e..fb2b1fcdc587 100644
--- 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
index f28a2671a1a6..24086e7e7593 100644
--- 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 {