Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354751
b: refs/heads/master
c: ef4f527
h: refs/heads/master
i:
  354749: 515283a
  354747: 1abff85
  354743: 67bd659
  354735: d4f409c
  354719: 92e68d6
  354687: 2702aa0
v: v3
  • Loading branch information
Kevin Cernekee authored and Greg Kroah-Hartman committed Jan 16, 2013
1 parent 2c491b0 commit ae94311
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a205a56dc24811a2879572e52c902a38425a4473
refs/heads/master: ef4f527c48c8fcbb5e35dafaef4f9097f5e9d901
18 changes: 9 additions & 9 deletions trunk/drivers/tty/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1309,9 +1309,10 @@ static void uart_set_termios(struct tty_struct *tty,
}

/*
* In 2.4.5, calls to this will be serialized via the BKL in
* linux/drivers/char/tty_io.c:tty_release()
* linux/drivers/char/tty_io.c:do_tty_handup()
* Calls to uart_close() are serialised via the tty_lock in
* drivers/tty/tty_io.c:tty_release()
* drivers/tty/tty_io.c:do_tty_hangup()
* This runs from a workqueue and can sleep for a _short_ time only.
*/
static void uart_close(struct tty_struct *tty, struct file *filp)
{
Expand Down Expand Up @@ -1438,10 +1439,9 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
}

/*
* This is called with the BKL held in
* linux/drivers/char/tty_io.c:do_tty_hangup()
* We're called from the eventd thread, so we can sleep for
* a _short_ time only.
* Calls to uart_hangup() are serialised by the tty_lock in
* drivers/tty/tty_io.c:do_tty_hangup()
* This runs from a workqueue and can sleep for a _short_ time only.
*/
static void uart_hangup(struct tty_struct *tty)
{
Expand Down Expand Up @@ -1522,8 +1522,8 @@ static void uart_dtr_rts(struct tty_port *port, int onoff)
}

/*
* calls to uart_open are serialised by the BKL in
* fs/char_dev.c:chrdev_open()
* Calls to uart_open are serialised by the tty_lock in
* drivers/tty/tty_io.c:tty_open()
* Note that if this fails, then uart_close() _will_ be called.
*
* In time, we want to scrap the "opening nonpresent ports"
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/tty_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ EXPORT_SYMBOL_GPL(tty_wakeup);
* __tty_hangup - actual handler for hangup events
* @work: tty device
*
* This can be called by the "eventd" kernel thread. That is process
* This can be called by a "kworker" kernel thread. That is process
* synchronous but doesn't hold any locks, so we need to make sure we
* have the appropriate locks for what we're doing.
*
Expand Down

0 comments on commit ae94311

Please sign in to comment.