--- linux-2.6.0-test5/kernel/futex.c.orig	2003-09-12 15:14:42.000000000 -0300
+++ linux-2.6.0-test5/kernel/futex.c	2003-09-12 15:14:56.000000000 -0300
@@ -381,13 +381,12 @@
 		 * We were woken already.
 		 */
 		spin_unlock(&futex_lock);
-		set_current_state(TASK_RUNNING);
+		__set_current_state(TASK_RUNNING);
 		return 0;
 	}
 
 	spin_unlock(&futex_lock);
 	time = schedule_timeout(time);
-	set_current_state(TASK_RUNNING);
 
 	/*
 	 * NOTE: we don't remove ourselves from the waitqueue because