diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2011-04-20 10:43:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 23:19:12 +0200 |
| commit | 83c67571b372c4a40023a84e183fdb7fa4e89e48 (patch) | |
| tree | 3865faaf2546860e5107ac6709f39c1d352e7743 /drivers/tty | |
| parent | TTY: serial_core, remove superfluous set_task_state (diff) | |
| download | linux-83c67571b372c4a40023a84e183fdb7fa4e89e48.tar.xz linux-83c67571b372c4a40023a84e183fdb7fa4e89e48.zip | |
TTY: tty_io, annotate locking functions
tty_write_lock and tty_write_unlock contain imbalanced locking. But
this is intentional, so mark them appropriately by
__acquires/__releases.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/tty_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 3f4ad9885430..6556f7452ba6 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -962,12 +962,14 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count, } void tty_write_unlock(struct tty_struct *tty) + __releases(&tty->atomic_write_lock) { mutex_unlock(&tty->atomic_write_lock); wake_up_interruptible_poll(&tty->write_wait, POLLOUT); } int tty_write_lock(struct tty_struct *tty, int ndelay) + __acquires(&tty->atomic_write_lock) { if (!mutex_trylock(&tty->atomic_write_lock)) { if (ndelay) |