# HG changeset patch
# User Richard Lowe <richlowe@richlowe.net>
# Date 1349151503 -3600
# Node ID 91dbcb77a2f98f5d21775be283498893d34a2da4
# Parent  69f1ce08ddb717c9677e95127ced9d017b8e730d
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>

diff -r 69f1ce08ddb7 -r 91dbcb77a2f9 usr/src/uts/common/syscall/poll.c
--- a/usr/src/uts/common/syscall/poll.c	Sun Sep 16 13:48:36 2012 +0100
+++ 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();
 	}