patch-2.0.37 linux/fs/select.c

Next file: linux/include/asm-alpha/ioctls.h
Previous file: linux/fs/read_write.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.36/linux/fs/select.c linux/fs/select.c
@@ -347,10 +347,8 @@
 		(fd_set *) &res_out,
 		(fd_set *) &res_ex,
 		(fd_set *) &locked);
-	timeout = current->timeout - jiffies - 1;
+	timeout = current->timeout?current->timeout - jiffies - 1:0;
 	current->timeout = 0;
-	if ((long) timeout < 0)
-		timeout = 0;
 	if (tvp && !(current->personality & STICKY_TIMEOUTS)) {
 		put_user(timeout/HZ, &tvp->tv_sec);
 		timeout %= HZ;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov