Milton D. Miller II wrote:
> __remove_wait_queue(&x->wait, &wait);
>
> should be under
> spin_lock_irq(&x->wait.lock);
Duh! Updated patch is attached.
- Dave
--- ./include/linux-dist/completion.h Mon Dec 9 23:49:44 2002
+++ ./include/linux/completion.h Tue Dec 10 09:35:57 2002
@@ -28,6 +28,7 @@
}
extern void FASTCALL(wait_for_completion(struct completion *));
+extern int FASTCALL(wait_timeout(struct completion *, signed long jiffies));
extern void FASTCALL(complete(struct completion *));
extern void FASTCALL(complete_all(struct completion *));
--- ./kernel-dist/ksyms.c Thu Dec 12 10:24:44 2002
+++ ./kernel/ksyms.c Tue Dec 10 09:35:57 2002
@@ -404,7 +404,9 @@ EXPORT_SYMBOL(autoremove_wake_function);
/* completion handling */
EXPORT_SYMBOL(wait_for_completion);
+EXPORT_SYMBOL(wait_timeout);
EXPORT_SYMBOL(complete);
+EXPORT_SYMBOL(complete_all);
/* The notion of irq probe/assignment is foreign to S/390 */
--- ./kernel-dist/sched.c Thu Dec 12 10:24:44 2002
+++ ./kernel/sched.c Thu Dec 12 10:15:56 2002
@@ -1204,6 +1204,11 @@ void complete_all(struct completion *x)
void wait_for_completion(struct completion *x)
{
+ (void) wait_timeout (x, MAX_SCHEDULE_TIMEOUT);
+}
+
+int wait_timeout(struct completion *x, signed long timeout)
+{
might_sleep();
spin_lock_irq(&x->wait.lock);
if (!x->done) {
@@ -1214,13 +1219,18 @@ void wait_for_completion(struct completi
do {
__set_current_state(TASK_UNINTERRUPTIBLE);
spin_unlock_irq(&x->wait.lock);
- schedule();
+ timeout = schedule_timeout(timeout);
spin_lock_irq(&x->wait.lock);
- } while (!x->done);
+ } while (!x->done && timeout != 0);
__remove_wait_queue(&x->wait, &wait);
}
- x->done--;
+ if (x->done) {
+ timeout = 1;
+ x->done--;
+ }
spin_unlock_irq(&x->wait.lock);
+ /* nonzero return means we timed out */
+ return timeout == 0;
}
#define SLEEP_ON_VAR \
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Dec 15 2002 - 22:00:25 EST