diff --git a/[refs] b/[refs]
index a9c754d29629..5a1ee78d6f53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94359f05cb7e1fed0deccc83ebc30a1175a9ae16
+refs/heads/master: b8487b924177385e3932f846f430b73ce8e69bba
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 62a9ee8db13e..2bd9625fa62d 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -483,7 +483,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 		if (sched_feat(NEW_FAIR_SLEEPERS))
 			vruntime -= sysctl_sched_latency;
 
-		vruntime = max(vruntime, se->vruntime);
+		vruntime = max_t(s64, vruntime, se->vruntime);
 	}
 
 	se->vruntime = vruntime;