diff options
| author | Andi Kleen <ak@suse.de> | 2007-10-18 21:32:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2007-10-18 21:32:55 +0200 |
| commit | 51e97990234ed195a05b424bf04c387f5ae5e5cf (patch) | |
| tree | 9b1cc97b89057464f9a06ac49fab95257da23fdc | |
| parent | d85714d81cc0408daddb68c10f7fd69eafe7c213 (diff) | |
| download | kernel-crypto-51e97990234ed195a05b424bf04c387f5ae5e5cf.tar.gz kernel-crypto-51e97990234ed195a05b424bf04c387f5ae5e5cf.tar.xz kernel-crypto-51e97990234ed195a05b424bf04c387f5ae5e5cf.zip | |
sched: fix return value of wait_for_completion_interruptible()
The recent wait_for_completion() cleanups:
commit 8cbbe86dfcfd68ad69916164bdc838d9e09adca8
Author: Andi Kleen <ak@suse.de>
Date: Mon Oct 15 17:00:14 2007 +0200
sched: cleanup: refactor common code of sleep_on / wait_for_completion
Refactor common code of sleep_on / wait_for_completion
broke the return value of wait_for_completion_interruptible().
Previously it returned 0 on success, now -1. Fix that.
Problem found by Geert Uytterhoeven.
[ mingo: fixed whitespace damage ]
Reported-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | kernel/sched.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 92721d1534b..f6febb25c7b 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -3859,7 +3859,10 @@ EXPORT_SYMBOL(wait_for_completion_timeout); int __sched wait_for_completion_interruptible(struct completion *x) { - return wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE); + long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE); + if (t == -ERESTARTSYS) + return t; + return 0; } EXPORT_SYMBOL(wait_for_completion_interruptible); |