[src/trunk]: src/sys/compat/linux/common handle timeouts like before.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/467ce6cd4891
branches:  trunk
changeset: 786160:467ce6cd4891
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Apr 17 14:39:40 2013 +0000

description:
handle timeouts like before.

diffstat:

 sys/compat/linux/common/linux_futex.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 4e4d15cd6d91 -r 467ce6cd4891 sys/compat/linux/common/linux_futex.c
--- a/sys/compat/linux/common/linux_futex.c     Wed Apr 17 14:38:04 2013 +0000
+++ b/sys/compat/linux/common/linux_futex.c     Wed Apr 17 14:39:40 2013 +0000
@@ -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 @@
                        if (error == ETIMEDOUT && SCARG(uap, timeout) != NULL)
                                tout = 1;
                        else
-                               return error;
+                               tout = 0;
                }
                FUTEX_SYSTEM_LOCK;
                if ((error = copyin(SCARG(uap, uaddr),