Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[~andy/linux] / drivers / char / vc_screen.c

diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index c1791a63d99d40c2e1dbe7a4fba6e1f8cfba8c16..bcce46c96b8871886a0a6ebebbea930f2f609018 100644 (file)
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -463,10 +463,10 @@ vcs_open(struct inode *inode, struct file *filp)
        unsigned int currcons = iminor(inode) & 127;
        int ret = 0;
        
-       lock_kernel();
+       tty_lock();
        if(currcons && !vc_cons_allocated(currcons-1))
                ret = -ENXIO;
-       unlock_kernel();
+       tty_unlock();
        return ret;
 }