---

yaml --- r: 115948 b: refs/heads/master c: 293adee h: refs/heads/master v: v3
git-mirror · Oct 20, 2008 · 955e125 · 955e125
1 parent 79a675c
commit 955e125
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 656eb2cd5da153762f2e8419ca117ce12ef522c3
+refs/heads/master: 293adee601bcd4cdb5076a9bda187137de17e96e
diff --git a/trunk/kernel/kthread.c b/trunk/kernel/kthread.c
@@ -171,12 +171,11 @@ EXPORT_SYMBOL(kthread_create);
  */
 void kthread_bind(struct task_struct *k, unsigned int cpu)
 {
-	if (k->state != TASK_UNINTERRUPTIBLE) {
+	/* Must have done schedule() in kthread() before we set_task_cpu */
+	if (!wait_task_inactive(k, TASK_UNINTERRUPTIBLE)) {
 		WARN_ON(1);
 		return;
 	}
-	/* Must have done schedule() in kthread() before we set_task_cpu */
-	wait_task_inactive(k, 0);
 	set_task_cpu(k, cpu);
 	k->cpus_allowed = cpumask_of_cpu(cpu);
 	k->rt.nr_cpus_allowed = 1;