patch-2.1.127 linux/drivers/char/ftape/lowlevel/ftape-io.c

• Lines: 30
• Date: Wed Nov 4 09:57:43 1998
• Orig file: v2.1.126/linux/drivers/char/ftape/lowlevel/ftape-io.c
• Orig date: Tue Dec 2 09:33:16 1997

diff -u --recursive --new-file v2.1.126/linux/drivers/char/ftape/lowlevel/ftape-io.c linux/drivers/char/ftape/lowlevel/ftape-io.c
@@ -89,17 +89,18 @@
 		/*  Time too small for scheduler, do a busy wait ! */
 		ftape_udelay(time);
 	} else {
+		long timeout;
 		unsigned long flags;
 		unsigned int ticks = (time + FT_USPT - 1) / FT_USPT;
 
 		TRACE(ft_t_any, "%d msec, %d ticks", time/1000, ticks);
-		current->timeout = jiffies + ticks;
+		timeout = ticks;
 		current->state = TASK_INTERRUPTIBLE;
 		save_flags(flags);
 		sti();
 		do {
 			while (current->state != TASK_RUNNING) {
-				schedule();
+				timeout = schedule_timeout(timeout);
 			}
 			/*  Mmm. Isn't current->blocked == 0xffffffff ?
 			 */
@@ -108,7 +109,7 @@
 				      "awoken by non-blocked signal :-(");
 				break;	/* exit on signal */
 			}
-		} while (current->timeout > 0);
+		} while (timeout);
 		restore_flags(flags);
 	}
 	TRACE_EXIT;