1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index eab3a1ff99e..a672ed192d3 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -202,7 +202,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         /* Select the proper current console and verify
          * sanity of the situation under the console lock.
          */
-        acquire_console_sem();
+        console_lock();
 
         attr = (currcons & 128);
         currcons = (currcons & 127);
@@ -336,9 +336,9 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                  * the pagefault handling code may want to call printk().
                  */
 
-                release_console_sem();
+                console_unlock();
                 ret = copy_to_user(buf, con_buf_start, orig_count);
-                acquire_console_sem();
+                console_lock();
 
                 if (ret) {
                         read += (orig_count - ret);
@@ -354,7 +354,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         if (read)
                 ret = read;
 unlock_out:
-        release_console_sem();
+        console_unlock();
         mutex_unlock(&con_buf_mtx);
         return ret;
 }
@@ -379,7 +379,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         /* Select the proper current console and verify
          * sanity of the situation under the console lock.
          */
-        acquire_console_sem();
+        console_lock();
 
         attr = (currcons & 128);
         currcons = (currcons & 127);
@@ -414,9 +414,9 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                 /* Temporarily drop the console lock so that we can read
                  * in the write data from userspace safely.
                  */
-                release_console_sem();
+                console_unlock();
                 ret = copy_from_user(con_buf, buf, this_round);
-                acquire_console_sem();
+                console_lock();
 
                 if (ret) {
                         this_round -= ret;
@@ -542,7 +542,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                 vcs_scr_updated(vc);
 
 unlock_out:
-        release_console_sem();
+        console_unlock();
 
         mutex_unlock(&con_buf_mtx);