From 7dbb6b82cbb5cda54ae8e9176eb523e95e56528f Mon Sep 17 00:00:00 2001
From: Gautham R Shenoy <ego@in.ibm.com>
Date: Mon, 15 Oct 2007 17:00:14 +0200
Subject: [PATCH] --- yaml --- r: 69111 b: refs/heads/master c:
 638e13ac37a1a89473415f407cbffc1688a20fe2 h: refs/heads/master i:   69109:
 5141f85def3e0dbd4f907882a5d9db7c5432607c   69107:
 6c2573cd1697f3716896ec8a0d2fc7b4c25dba6d   69103:
 01e4181e5707ab853bc884daa9d60843f60f2fba v: v3

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

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;
 	}