---

yaml --- r: 234771 b: refs/heads/master c: 8eb90c3 h: refs/heads/master i: 234769: 35b180e 234767: b11eeae v: v3
git-mirror · Feb 25, 2011 · 5351c54 · 5351c54
1 parent 9cce544
commit 5351c54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c4602ff88d6d6ef0ee6d228ee9acaa6448ff6f5
+refs/heads/master: 8eb90c30e0e815a1308828352eabd03ca04229dd
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -2224,7 +2224,10 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
 		 * yield - it could be a while.
 		 */
 		if (unlikely(on_rq)) {
-			schedule_timeout_uninterruptible(1);
+			ktime_t to = ktime_set(0, NSEC_PER_SEC/HZ);
+
+			set_current_state(TASK_UNINTERRUPTIBLE);
+			schedule_hrtimeout(&to, HRTIMER_MODE_REL);
 			continue;
 		}