---

yaml --- r: 248673 b: refs/heads/master c: 83c6757 h: refs/heads/master i: 248671: bf75804 v: v3
git-mirror · Apr 25, 2011 · 98c620a · 98c620a
1 parent 92199e7
commit 98c620a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c831cff256c86588976e66bef7897633d534846c
+refs/heads/master: 83c67571b372c4a40023a84e183fdb7fa4e89e48
diff --git a/trunk/drivers/tty/tty_io.c b/trunk/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)