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;