Module Name: src
Committed By: christos
Date: Wed Apr 17 14:39:41 UTC 2013
Modified Files:
src/sys/compat/linux/common: linux_futex.c
Log Message:
handle timeouts like before.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux/common/linux_futex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_futex.c
diff -u src/sys/compat/linux/common/linux_futex.c:1.29 src/sys/compat/linux/common/linux_futex.c:1.30
--- src/sys/compat/linux/common/linux_futex.c:1.29 Tue Apr 16 19:03:05 2013
+++ src/sys/compat/linux/common/linux_futex.c Wed Apr 17 10:39:40 2013
@@ -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 stru
if (error == ETIMEDOUT && SCARG(uap, timeout) != NULL)
tout = 1;
else
- return error;
+ tout = 0;
}
FUTEX_SYSTEM_LOCK;
if ((error = copyin(SCARG(uap, uaddr),
