tty: replace BKL with a new tty_lock

As a preparation for replacing the big kernel lock
in the TTY layer, wrap all the callers in new
macros tty_lock, tty_lock_nested and tty_unlock.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 72dcfb2dc126..cf87c5336229 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -509,7 +509,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
 
         console = vc->vc_num;
 
-        lock_kernel();
+        tty_lock();
 
         if (!vc_cons_allocated(console)) {      /* impossible? */
                 ret = -ENOIOCTLCMD;
@@ -1336,7 +1336,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 ret = -ENOIOCTLCMD;
         }
 out:
-        unlock_kernel();
+        tty_unlock();
         return ret;
 eperm:
         ret = -EPERM;
@@ -1503,7 +1503,7 @@ long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
 
         console = vc->vc_num;
 
-        lock_kernel();
+        tty_lock();
 
         if (!vc_cons_allocated(console)) {      /* impossible? */
                 ret = -ENOIOCTLCMD;
@@ -1571,11 +1571,11 @@ long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
                 goto fallback;
         }
 out:
-        unlock_kernel();
+        tty_unlock();
         return ret;
 
 fallback:
-        unlock_kernel();
+        tty_unlock();
         return vt_ioctl(tty, file, cmd, arg);
 }