diff options
author | Kevin Cernekee <cernekee@gmail.com> | 2012-12-26 23:43:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 00:57:44 -0500 |
commit | ef4f527c48c8fcbb5e35dafaef4f9097f5e9d901 (patch) | |
tree | 22eedeb970323ae520a4d674e6e9e56eead9945f | |
parent | a205a56dc24811a2879572e52c902a38425a4473 (diff) |
tty: Fix comments that reference BKL, eventd, old paths
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/serial_core.c | 18 | ||||
-rw-r--r-- | drivers/tty/tty_io.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 82d7ce8c9409..ba7863bbbb4d 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c | |||
@@ -1309,9 +1309,10 @@ static void uart_set_termios(struct tty_struct *tty, | |||
1309 | } | 1309 | } |
1310 | 1310 | ||
1311 | /* | 1311 | /* |
1312 | * In 2.4.5, calls to this will be serialized via the BKL in | 1312 | * Calls to uart_close() are serialised via the tty_lock in |
1313 | * linux/drivers/char/tty_io.c:tty_release() | 1313 | * drivers/tty/tty_io.c:tty_release() |
1314 | * linux/drivers/char/tty_io.c:do_tty_handup() | 1314 | * drivers/tty/tty_io.c:do_tty_hangup() |
1315 | * This runs from a workqueue and can sleep for a _short_ time only. | ||
1315 | */ | 1316 | */ |
1316 | static void uart_close(struct tty_struct *tty, struct file *filp) | 1317 | static void uart_close(struct tty_struct *tty, struct file *filp) |
1317 | { | 1318 | { |
@@ -1438,10 +1439,9 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout) | |||
1438 | } | 1439 | } |
1439 | 1440 | ||
1440 | /* | 1441 | /* |
1441 | * This is called with the BKL held in | 1442 | * Calls to uart_hangup() are serialised by the tty_lock in |
1442 | * linux/drivers/char/tty_io.c:do_tty_hangup() | 1443 | * drivers/tty/tty_io.c:do_tty_hangup() |
1443 | * We're called from the eventd thread, so we can sleep for | 1444 | * This runs from a workqueue and can sleep for a _short_ time only. |
1444 | * a _short_ time only. | ||
1445 | */ | 1445 | */ |
1446 | static void uart_hangup(struct tty_struct *tty) | 1446 | static void uart_hangup(struct tty_struct *tty) |
1447 | { | 1447 | { |
@@ -1522,8 +1522,8 @@ static void uart_dtr_rts(struct tty_port *port, int onoff) | |||
1522 | } | 1522 | } |
1523 | 1523 | ||
1524 | /* | 1524 | /* |
1525 | * calls to uart_open are serialised by the BKL in | 1525 | * Calls to uart_open are serialised by the tty_lock in |
1526 | * fs/char_dev.c:chrdev_open() | 1526 | * drivers/tty/tty_io.c:tty_open() |
1527 | * Note that if this fails, then uart_close() _will_ be called. | 1527 | * Note that if this fails, then uart_close() _will_ be called. |
1528 | * | 1528 | * |
1529 | * In time, we want to scrap the "opening nonpresent ports" | 1529 | * In time, we want to scrap the "opening nonpresent ports" |
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index da9fde850754..54a254ab85c7 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c | |||
@@ -536,7 +536,7 @@ EXPORT_SYMBOL_GPL(tty_wakeup); | |||
536 | * __tty_hangup - actual handler for hangup events | 536 | * __tty_hangup - actual handler for hangup events |
537 | * @work: tty device | 537 | * @work: tty device |
538 | * | 538 | * |
539 | * This can be called by the "eventd" kernel thread. That is process | 539 | * This can be called by a "kworker" kernel thread. That is process |
540 | * synchronous but doesn't hold any locks, so we need to make sure we | 540 | * synchronous but doesn't hold any locks, so we need to make sure we |
541 | * have the appropriate locks for what we're doing. | 541 | * have the appropriate locks for what we're doing. |
542 | * | 542 | * |