diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2008-02-01 11:45:13 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-02-01 11:45:13 -0500 |
commit | 3588a085cd52ef080bf72df772378e1ba6bb292f (patch) | |
tree | 9c013c37431eb3a0d0da3ab14cbc4985600e82a2 /kernel/hrtimer.c | |
parent | 24e1c13c93cbdd05e4b7ea921c0050b036555adc (diff) |
hrtimer: fix hrtimer_init_sleeper() users
this patch:
commit 37bb6cb4097e29ffee970065b74499cbf10603a3
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri Jan 25 21:08:32 2008 +0100
hrtimer: unlock hrtimer_wakeup
Broke hrtimer_init_sleeper() users. It forgot to fix up the futex
caller of this function to detect the failed queueing and messed up
the do_nanosleep() caller in that it could leak a TASK_INTERRUPTIBLE
state.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index bd5d6b5060bc..1069998fe25f 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1315,6 +1315,8 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod | |||
1315 | 1315 | ||
1316 | } while (t->task && !signal_pending(current)); | 1316 | } while (t->task && !signal_pending(current)); |
1317 | 1317 | ||
1318 | __set_current_state(TASK_RUNNING); | ||
1319 | |||
1318 | return t->task == NULL; | 1320 | return t->task == NULL; |
1319 | } | 1321 | } |
1320 | 1322 | ||