X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fselect.c;h=87df51eadcf2bd170ab0271e189cf8a580aa1adb;hb=4d36a9e65d4966b433b2f3424d9457468bc80e00;hp=448e44001286754f891249f216f7af3a01d1bfee;hpb=44a504c405ae5c3a80e71acf71d6b1cb0db70715;p=linux-2.6-omap-h63xx.git

diff --git a/fs/select.c b/fs/select.c
index 448e4400128..87df51eadcf 100644
--- a/fs/select.c
+++ b/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;
 	}