aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2011-07-14 08:35:14 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-23 13:34:07 -0400
commit906cbe1364d94da7cbf74c1d05e3e78b2883f661 (patch)
treefca513a03781a2d0e2ac518aab13c8d528a0468c /drivers/tty/vt
parenteff4b0b9fe37873d3dc7ade0e08e6f0f89279b8b (diff)
TTY: remove tty_locked
We used it really only serial and ami_serial. The rest of the callsites were BUG/WARN_ONs to check if BTM is held. Now that we pruned tty_locked from both of the real users, we can get rid of tty_lock along with __big_tty_mutex_owner. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/selection.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index fb864e7fcd13..7a0a12ae5458 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -301,6 +301,8 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
301/* Insert the contents of the selection buffer into the 301/* Insert the contents of the selection buffer into the
302 * queue of the tty associated with the current console. 302 * queue of the tty associated with the current console.
303 * Invoked by ioctl(). 303 * Invoked by ioctl().
304 *
305 * Locking: always called with BTM from vt_ioctl
304 */ 306 */
305int paste_selection(struct tty_struct *tty) 307int paste_selection(struct tty_struct *tty)
306{ 308{
@@ -310,8 +312,6 @@ int paste_selection(struct tty_struct *tty)
310 struct tty_ldisc *ld; 312 struct tty_ldisc *ld;
311 DECLARE_WAITQUEUE(wait, current); 313 DECLARE_WAITQUEUE(wait, current);
312 314
313 /* always called with BTM from vt_ioctl */
314 WARN_ON(!tty_locked());
315 315
316 console_lock(); 316 console_lock();
317 poke_blanked_console(); 317 poke_blanked_console();