1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index c1791a63d99d..3e92ac22b583 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -115,7 +115,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();
+        acquire_console_mutex();
 
         attr = (currcons & 128);
         currcons = (currcons & 127);
@@ -246,9 +246,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();
+                release_console_mutex();
                 ret = copy_to_user(buf, con_buf_start, orig_count);
-                acquire_console_sem();
+                acquire_console_mutex();
 
                 if (ret) {
                         read += (orig_count - ret);
@@ -264,7 +264,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         if (read)
                 ret = read;
 unlock_out:
-        release_console_sem();
+        release_console_mutex();
         mutex_unlock(&con_buf_mtx);
         return ret;
 }
@@ -289,7 +289,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();
+        acquire_console_mutex();
 
         attr = (currcons & 128);
         currcons = (currcons & 127);
@@ -324,9 +324,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();
+                release_console_mutex();
                 ret = copy_from_user(con_buf, buf, this_round);
-                acquire_console_sem();
+                acquire_console_mutex();
 
                 if (ret) {
                         this_round -= ret;
@@ -450,7 +450,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         ret = written;
 
 unlock_out:
-        release_console_sem();
+        release_console_mutex();
 
         mutex_unlock(&con_buf_mtx);