1 files changed, 15 insertions, 56 deletions

diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
index 67feac9e6ebb..9ff986c32a21 100644
--- a/drivers/tty/tty_mutex.c
+++ b/drivers/tty/tty_mutex.c
@@ -4,70 +4,29 @@
 #include <linux/semaphore.h>
 #include <linux/sched.h>
 
-/* Legacy tty mutex glue */
-
-enum {
-        TTY_MUTEX_NORMAL,
-        TTY_MUTEX_NESTED,
-};
+/*
+ * The 'big tty mutex'
+ *
+ * This mutex is taken and released by tty_lock() and tty_unlock(),
+ * replacing the older big kernel lock.
+ * It can no longer be taken recursively, and does not get
+ * released implicitly while sleeping.
+ *
+ * Don't use in new code.
+ */
+static DEFINE_MUTEX(big_tty_mutex);
 
 /*
  * Getting the big tty mutex.
  */
-
-static void __lockfunc tty_lock_nested(struct tty_struct *tty,
-                                       unsigned int subclass)
+void __lockfunc tty_lock(void)
 {
-        if (tty->magic != TTY_MAGIC) {
-                printk(KERN_ERR "L Bad %p\n", tty);
-                WARN_ON(1);
-                return;
-        }
-        tty_kref_get(tty);
-        mutex_lock_nested(&tty->legacy_mutex, subclass);
-}
-
-void __lockfunc tty_lock(struct tty_struct *tty)
-{
-        return tty_lock_nested(tty, TTY_MUTEX_NORMAL);
+        mutex_lock(&big_tty_mutex);
 }
 EXPORT_SYMBOL(tty_lock);
 
-void __lockfunc tty_unlock(struct tty_struct *tty)
+void __lockfunc tty_unlock(void)
 {
-        if (tty->magic != TTY_MAGIC) {
-                printk(KERN_ERR "U Bad %p\n", tty);
-                WARN_ON(1);
-                return;
-        }
-        mutex_unlock(&tty->legacy_mutex);
-        tty_kref_put(tty);
+        mutex_unlock(&big_tty_mutex);
 }
 EXPORT_SYMBOL(tty_unlock);
-
-/*
- * Getting the big tty mutex for a pair of ttys with lock ordering
- * On a non pty/tty pair tty2 can be NULL which is just fine.
- */
-void __lockfunc tty_lock_pair(struct tty_struct *tty,
-                                        struct tty_struct *tty2)
-{
-        if (tty < tty2) {
-                tty_lock(tty);
-                tty_lock_nested(tty2, TTY_MUTEX_NESTED);
-        } else {
-                if (tty2 && tty2 != tty)
-                        tty_lock(tty2);
-                tty_lock_nested(tty, TTY_MUTEX_NESTED);
-        }
-}
-EXPORT_SYMBOL(tty_lock_pair);
-
-void __lockfunc tty_unlock_pair(struct tty_struct *tty,
-                                                struct tty_struct *tty2)
-{
-        tty_unlock(tty);
-        if (tty2 && tty2 != tty)
-                tty_unlock(tty2);
-}
-EXPORT_SYMBOL(tty_unlock_pair);