Re: [patch 2/2] hrtimer

[Thomas Gleixner <tglx@linutronix.de>]

On Tue, 2006-03-28 at 03:55 +0400, Oleg Nesterov wrote:
> Instead of exit(), 'task' can go to TASK_STOPPED or TASK_UNINTERRUPTIBLE
> after return from do_nanosleep(), it will be awakened by hrtimer_wakeup()
> unexpectedly.

Yep, you are right.

Index: linux-2.6.16/kernel/hrtimer.c
===================================================================
--- linux-2.6.16.orig/kernel/hrtimer.c
+++ linux-2.6.16/kernel/hrtimer.c
@@ -684,10 +684,9 @@ static int __sched do_nanosleep(struct h
 
 		schedule();
 
-		if (unlikely(t->task)) {
-			hrtimer_cancel(&t->timer);
-			mode = HRTIMER_ABS;
-		}
+		hrtimer_cancel(&t->timer);
+		mode = HRTIMER_ABS;
+
 	} while (t->task && !signal_pending(current));
 
 	return t->task == NULL;