diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-11-07 22:04:45 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-11-07 22:04:45 +0000 |
| commit | ad2a40e16d2bee59cfe84f89db3ce92b9f15adff (patch) | |
| tree | bc8e23c4588b29e4602a54b72dbe2f1d8786468d /usr/src/uts/common/syscall/poll.c | |
| parent | b5f683274309a9c6f46eea8ce5d0cca514d977a8 (diff) | |
| parent | 7c45eec5760d4195b6b85770e7ac51c380adfb8a (diff) | |
| download | illumos-joyent-ad2a40e16d2bee59cfe84f89db3ce92b9f15adff.tar.gz | |
Illumos sync
Diffstat (limited to 'usr/src/uts/common/syscall/poll.c')
| -rw-r--r-- | usr/src/uts/common/syscall/poll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/syscall/poll.c b/usr/src/uts/common/syscall/poll.c index 5e87d073e3..7f37529941 100644 --- a/usr/src/uts/common/syscall/poll.c +++ b/usr/src/uts/common/syscall/poll.c @@ -308,7 +308,7 @@ poll_common(pollfd_t *fds, nfds_t nfds, timespec_t *tsp, k_sigset_t *ksetp) 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(); } |