From 30deea4015e9587e3e621cae4188e6af3a7ccf30 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sat, 25 Oct 2008 12:41:41 -0700 Subject: [PATCH] --- yaml --- r: 117830 b: refs/heads/master c: 4d36a9e65d4966b433b2f3424d9457468bc80e00 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/compat.c | 5 +++-- trunk/fs/select.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a730d24636b0..96beb0d0afb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44a504c405ae5c3a80e71acf71d6b1cb0db70715 +refs/heads/master: 4d36a9e65d4966b433b2f3424d9457468bc80e00 diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index fe3c9bf87608..e5f49f538502 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -1684,8 +1684,9 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, return -EFAULT; to = &end_time; - if (poll_select_set_timeout(to, tv.tv_sec, - tv.tv_usec * NSEC_PER_USEC)) + if (poll_select_set_timeout(to, + tv.tv_sec + (tv.tv_usec / USEC_PER_SEC), + (tv.tv_usec % USEC_PER_SEC) * NSEC_PER_USEC)) return -EINVAL; } diff --git a/trunk/fs/select.c b/trunk/fs/select.c index 448e44001286..87df51eadcf2 100644 --- a/trunk/fs/select.c +++ b/trunk/fs/select.c @@ -519,8 +519,9 @@ asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp, return -EFAULT; to = &end_time; - if (poll_select_set_timeout(to, tv.tv_sec, - tv.tv_usec * NSEC_PER_USEC)) + if (poll_select_set_timeout(to, + tv.tv_sec + (tv.tv_usec / USEC_PER_SEC), + (tv.tv_usec % USEC_PER_SEC) * NSEC_PER_USEC)) return -EINVAL; }