tty: Push the lock down further into the ldisc code

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 1e2413093615be802b2c8eb7c62940660b6c6c6a..c408c81c06a0967fb62f1d8905af5bb93cf8fdb0 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1347,9 +1347,7 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx,
         * If we fail here just call release_tty to clean up.  No need
         * to decrement the use counts, as release_tty doesn't care.
         */
-       lock_kernel();
        retval = tty_ldisc_setup(tty, tty->link);
-       unlock_kernel();
        if (retval)
                goto release_mem_out;
        return tty;

diff --cc drivers/char/tty_ldisc.c
Simple merge