From 46d2993679db0bfd928cdee3b6bada1af35de638 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 15 Jan 2009 14:53:39 +0100
Subject: [PATCH] --- yaml --- r: 129815 b: refs/heads/master c:
 e17036dac189dd034c092a91df56aa740db7146d h: refs/heads/master i:   129813:
 c5688cd7eb2418fdd1dbcee2f6ee142286e333ad   129811:
 dd7f234bd50a4db1353a8f485a121bdd1f0f00f9   129807:
 51dde547ae2294112ed529a43779369306250eda v: v3

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

diff --git a/[refs] b/[refs]
index 5fd7801a0b2c..a1626814edcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bc912b71b6f33b041cfde93ca3f019cbaa852bc
+refs/heads/master: e17036dac189dd034c092a91df56aa740db7146d
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index cdebd8089cb0..16b419bb8b0a 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -283,7 +283,7 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq)
 						   struct sched_entity,
 						   run_node);
 
-		if (vruntime == cfs_rq->min_vruntime)
+		if (!cfs_rq->curr)
 			vruntime = se->vruntime;
 		else
 			vruntime = min_vruntime(vruntime, se->vruntime);