diff --git a/[refs] b/[refs]
index 5c9326e48c3b..2eb5c4338306 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cb350baf580017da38199625b7365b1763d7180
+refs/heads/master: 638e13ac37a1a89473415f407cbffc1688a20fe2
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 9ac99896db8f..48fc74b6df55 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1133,7 +1133,7 @@ void wait_task_inactive(struct task_struct *p)
 	 * yield - it could be a while.
 	 */
 	if (unlikely(on_rq)) {
-		yield();
+		schedule_timeout_uninterruptible(1);
 		goto repeat;
 	}