From 042370697ed382e7ae1ff324c33259bcabfb3767 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 15 Oct 2007 17:00:11 +0200
Subject: [PATCH] --- yaml --- r: 69075 b: refs/heads/master c:
 368059a977871def0f88a92eefb6ecc1f7b6132f h: refs/heads/master i:   69073:
 f49b89ae5d0a4679cf06ba7eb0783f778c821cbf   69071:
 205de0d588fe86fe8a9321a7fd1d4cbdeaae50e6 v: v3

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

diff --git a/[refs] b/[refs]
index 435dd8042893..f0c2f231fb2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02e4bac2a5b097e23d757bf2953740b3d51b7976
+refs/heads/master: 368059a977871def0f88a92eefb6ecc1f7b6132f
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 2bd9625fa62d..91664d665c0f 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -117,8 +117,8 @@ static inline struct task_struct *task_of(struct sched_entity *se)
 static inline u64
 max_vruntime(u64 min_vruntime, u64 vruntime)
 {
-	if ((vruntime > min_vruntime) ||
-	    (min_vruntime > (1ULL << 61) && vruntime < (1ULL << 50)))
+	s64 delta = (s64)(vruntime - min_vruntime);
+	if (delta > 0)
 		min_vruntime = vruntime;
 
 	return min_vruntime;