From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 20 Apr 2011 08:43:18 +0000 (+0200)
Subject: TTY: tty_io, annotate locking functions
X-Git-Tag: upstream/snapshot3+hdmi~10347^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83c67571b372c4a40023a84e183fdb7fa4e89e48;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 3f4ad98..6556f74 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)