patch-2.1.128 linux/arch/alpha/kernel/osf_sys.c

• Lines: 27
• Date: Wed Nov 11 15:39:18 1998
• Orig file: v2.1.127/linux/arch/alpha/kernel/osf_sys.c
• Orig date: Sun Nov 8 14:02:41 1998

diff -u --recursive --new-file v2.1.127/linux/arch/alpha/kernel/osf_sys.c linux/arch/alpha/kernel/osf_sys.c
@@ -1136,7 +1136,7 @@
 	unsigned long timeout;
 	int ret;
 
-	timeout = ~0UL;
+	timeout = MAX_SCHEDULE_TIMEOUT;
 	if (tvp) {
 		time_t sec, usec;
 
@@ -1147,8 +1147,6 @@
 
 		timeout = (usec + 1000000/HZ - 1) / (1000000/HZ);
 		timeout += sec * HZ;
-		if (timeout)
-			timeout += jiffies + 1;
 	}
 
 	ret = -ENOMEM;
@@ -1168,7 +1166,7 @@
 	zero_fd_set(n, fds->res_out);
 	zero_fd_set(n, fds->res_ex);
 
-	ret = do_select(n, fds, timeout);
+	ret = do_select(n, fds, &timeout);
 
 	/* OSF does not copy back the remaining time.  */