---

 25-akpm/kernel/sched.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN kernel/sched.c~futex_wait-debug-fix kernel/sched.c
--- 25/kernel/sched.c~futex_wait-debug-fix	2004-03-17 02:28:11.301162776 -0800
+++ 25-akpm/kernel/sched.c	2004-03-17 02:28:11.306162016 -0800
@@ -743,8 +743,6 @@ static int try_to_wake_up(task_t * p, un
 		set_task_cpu(p, new_cpu);
 		goto repeat_lock_task;
 	}
-	goto out_activate;
-
 	if ((p->flags & PF_FUTEX_DEBUG)
 	    && !(current->flags & PF_FUTEX_DEBUG)) {
 		printk("%s %i waking %s: %i %i\n",
@@ -752,6 +750,7 @@ static int try_to_wake_up(task_t * p, un
 		       p->comm, p->tgid, p->pid);
 		WARN_ON(1);
 	}
+	goto out_activate;
 
 repeat_lock_task:
 	task_rq_unlock(rq, &flags);

_