diff options
| author | christos <christos@NetBSD.org> | 2013-04-17 14:39:40 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2013-04-17 14:39:40 +0000 |
| commit | 9fc75883526efbfdcd2edde40df4dbd2de6f89a6 (patch) | |
| tree | 7c8fc2f9522162f9359ac9530d1f051a5e5fb668 /sys/compat/linux/common/linux_futex.c | |
| parent | 18d270943f1737a65c9c0b1414c067204784a31f (diff) | |
handle timeouts like before.
Diffstat (limited to 'sys/compat/linux/common/linux_futex.c')
| -rw-r--r-- | sys/compat/linux/common/linux_futex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/compat/linux/common/linux_futex.c b/sys/compat/linux/common/linux_futex.c index 2152896a677..76524ea0af0 100644 --- a/sys/compat/linux/common/linux_futex.c +++ b/sys/compat/linux/common/linux_futex.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_futex.c,v 1.29 2013/04/16 23:03:05 christos Exp $ */ +/* $NetBSD: linux_futex.c,v 1.30 2013/04/17 14:39:40 christos Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.29 2013/04/16 23:03:05 christos Exp $"); +__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.30 2013/04/17 14:39:40 christos Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -206,7 +206,7 @@ linux_do_futex(struct lwp *l, const struct linux_sys_futex_args *uap, register_t if (error == ETIMEDOUT && SCARG(uap, timeout) != NULL) tout = 1; else - return error; + tout = 0; } FUTEX_SYSTEM_LOCK; if ((error = copyin(SCARG(uap, uaddr), |
