Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv14292
Modified Files:
tty_io.c
Log Message:
Merge with 2.5.40
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tty_io.c 12 Mar 2003 23:00:44 -0000 1.8
+++ tty_io.c 14 Mar 2003 00:39:53 -0000 1.9
@@ -1265,7 +1265,6 @@
/*
* Make sure that the tty's task queue isn't activated.
*/
- run_task_queue(&tq_timer);
flush_scheduled_tasks();
/*
@@ -1876,7 +1875,6 @@
/*
* The tq handling here is a little racy - tty->SAK_tq may already be queued.
- * But there's no mechanism to fix that without futzing with tqueue_lock.
* Fortunately we don't need to worry, because if ->SAK_tq is already queued,
* the values which we write to it will be identical to the values which it
* already has. --akpm
@@ -1902,7 +1900,7 @@
unsigned long flags;
if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
- queue_task(&tty->flip.tqueue, &tq_timer);
+ schedule_task(&tty->flip.tqueue);
return;
}
if (tty->flip.buf_num) {
@@ -1979,7 +1977,7 @@
if (tty->low_latency)
flush_to_ldisc((void *) tty);
else
- queue_task(&tty->flip.tqueue, &tq_timer);
+ schedule_task(&tty->flip.tqueue);
}
/*
|
