diff options
| author | dsl <dsl@NetBSD.org> | 2007-06-04 21:02:22 +0000 |
|---|---|---|
| committer | dsl <dsl@NetBSD.org> | 2007-06-04 21:02:22 +0000 |
| commit | 3e4175ccc9e7217ea0b3462799de6a5fa2a20391 (patch) | |
| tree | bfd50da8485feccbb34dacf04eb48d5e878ffeae /sys/compat/linux/common/linux_misc.c | |
| parent | a8565cf99b88ffe6143bc83dbb95eb10c476ce23 (diff) | |
Fix select() without a timeout parameter.
Diffstat (limited to 'sys/compat/linux/common/linux_misc.c')
| -rw-r--r-- | sys/compat/linux/common/linux_misc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c index db9d8b14b5e..ea774354cbc 100644 --- a/sys/compat/linux/common/linux_misc.c +++ b/sys/compat/linux/common/linux_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_misc.c,v 1.177 2007/06/02 11:51:42 dsl Exp $ */ +/* $NetBSD: linux_misc.c,v 1.178 2007/06/04 21:02:22 dsl Exp $ */ /*- * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.177 2007/06/02 11:51:42 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.178 2007/06/04 21:02:22 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ptrace.h" @@ -915,7 +915,7 @@ linux_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout) fd_set *readfds, *writefds, *exceptfds; struct timeval *timeout; { - struct timeval tv0, tv1, utv; + struct timeval tv0, tv1, utv, *tv = NULL; int error; /* @@ -939,11 +939,12 @@ linux_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout) if (utv.tv_sec < 0) timerclear(&utv); } + tv = &utv; microtime(&tv0); } error = selcommon(l, retval, nfds, readfds, writefds, exceptfds, - &utv, NULL); + tv, NULL); if (error) { /* |
