2.6.9-rc3-bk5

 Documentation

diff -Nru a/Documentation/tty.txt b/Documentation/tty.txt
--- a/Documentation/tty.txt   2004-09-23 14:55:33 -07:00
+++ b/Documentation/tty.txt   2004-10-02 15:45:19 -07:00
@@ -60,8 +60,8 @@
 
 set_termios()   -   Called on termios structure changes. The caller
          passes the old termios data and the current data
-         is in the tty. Called under the termios lock so
-         may not sleep. Serialized against itself only.
+         is in the tty. Called under the termios semaphore so
+         allowed to sleep. Serialized against itself only.
 
 read()      -   Move data from the line discipline to the user.
          Multiple read calls may occur in parallel and the
@@ -158,8 +158,8 @@
 
 ioctl()      -   Called when an ioctl may be for the driver
 
-set_termios()   -   Called on termios change, may get parallel calls,
-         may block for now (may change that)
+set_termios()   -   Called on termios change, serialized against
+         itself by a semaphore. May sleep.
 
 set_ldisc()   -   Notifier for discipline change. At the point this 
          is done the discipline is not yet usable. Can now