changeset 13846:e00baf913d93

3150 poll times out immediately in 32bit kernels Reviewed by: Eric Schrock <eric.schrock@delphix.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Gordon Ross <gwr@nexenta.com> Approved by: Robert Mustacchi <rm@joyent.com>
author Richard Lowe <richlowe@richlowe.net>
date Tue, 02 Oct 2012 05:18:23 +0100
parents 025b7e65c7ac
children d79e5216dd27
files usr/src/uts/common/syscall/poll.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/syscall/poll.c	Tue Oct 02 14:07:55 2012 -0400
+++ b/usr/src/uts/common/syscall/poll.c	Tue Oct 02 05:18:23 2012 +0100
@@ -308,7 +308,7 @@
 		deadline = 0;
 	} else {
 		/* They must wait at least a tick. */
-		deadline = tsp->tv_sec * NANOSEC + tsp->tv_nsec;
+		deadline = ((hrtime_t)tsp->tv_sec * NANOSEC) + tsp->tv_nsec;
 		deadline = MAX(deadline, nsec_per_tick);
 		deadline += gethrtime();
 	}