X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fcompat.c;h=e5f49f5385028b865aca64890a588eaa173db042;hb=6209344f5a3795d34b7f2c0061f49802283b6bdd;hp=fe3c9bf876089f1d71f7b45b92fb5110693eb599;hpb=0d876c6a96e2cabf8632e8066b617d9c2dec9518;p=linux-2.6-omap-h63xx.git

diff --git a/fs/compat.c b/fs/compat.c
index fe3c9bf8760..e5f49f53850 100644
--- a/fs/compat.c
+++ b/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;
 	}