console: rename acquire/release_console_sem() to console_lock/unlock()

The -rt patches change the console_semaphore to console_mutex.  As a
result, a quite large chunk of the patches changes all
acquire/release_console_sem() to acquire/release_console_mutex()

This commit makes things use more neutral function names which dont make
implications about the underlying lock.

The only real change is the return value of console_trylock which is
inverted from try_acquire_console_sem()

This patch also paves the way to switching console_sem from a semaphore to
a mutex.

[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]
Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Thomas Gleixner <tglx@tglx.de>
Cc: Greg KH <gregkh@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

6 files changed, 105 insertions, 105 deletions

diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index a2f2b3254499..602d9845c52f 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -829,7 +829,7 @@ static void __init sbd_probe_duarts(void)
 #ifdef CONFIG_SERIAL_SB1250_DUART_CONSOLE
 /*
  * Serial console stuff.  Very basic, polling driver for doing serial
- * console output.  The console_sem is held by the caller, so we
+ * console output.  The console_lock is held by the caller, so we
  * shouldn't be interrupted for more console activity.
  */
 static void sbd_console_putchar(struct uart_port *uport, int ch)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 464d09d97873..6158eae0f64a 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -3256,7 +3256,7 @@ static ssize_t show_cons_active(struct device *dev,
         struct console *c;
         ssize_t count = 0;
 
-        acquire_console_sem();
+        console_lock();
         for (c = console_drivers; c; c = c->next) {
                 if (!c->device)
                         continue;
@@ -3271,7 +3271,7 @@ static ssize_t show_cons_active(struct device *dev,
         while (i--)
                 count += sprintf(buf + count, "%s%d%c",
                                  cs[i]->name, cs[i]->index, i ? ' ':'\n');
-        release_console_sem();
+        console_unlock();
 
         return count;
 }
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index ebae344ce910..c956ed6c83a3 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -316,9 +316,9 @@ int paste_selection(struct tty_struct *tty)
         /* always called with BTM from vt_ioctl */
         WARN_ON(!tty_locked());
 
-        acquire_console_sem();
+        console_lock();
         poke_blanked_console();
-        release_console_sem();
+        console_unlock();
 
         ld = tty_ldisc_ref(tty);
         if (!ld) {
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index eab3a1ff99e4..a672ed192d33 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);
 
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 76407eca9ab0..b230bd3f056f 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1003,9 +1003,9 @@ static int vt_resize(struct tty_struct *tty, struct winsize *ws)
         struct vc_data *vc = tty->driver_data;
         int ret;
 
-        acquire_console_sem();
+        console_lock();
         ret = vc_do_resize(tty, vc, ws->ws_col, ws->ws_row);
-        release_console_sem();
+        console_unlock();
         return ret;
 }
 
@@ -1271,7 +1271,7 @@ static void default_attr(struct vc_data *vc)
         vc->vc_color = vc->vc_def_color;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_m(struct vc_data *vc)
 {
         int i;
@@ -1415,7 +1415,7 @@ int mouse_reporting(void)
         return vc_cons[fg_console].d->vc_report_mouse;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void set_mode(struct vc_data *vc, int on_off)
 {
         int i;
@@ -1485,7 +1485,7 @@ static void set_mode(struct vc_data *vc, int on_off)
                 }
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void setterm_command(struct vc_data *vc)
 {
         switch(vc->vc_par[0]) {
@@ -1545,7 +1545,7 @@ static void setterm_command(struct vc_data *vc)
         }
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_at(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_cols - vc->vc_x)
@@ -1555,7 +1555,7 @@ static void csi_at(struct vc_data *vc, unsigned int nr)
         insert_char(vc, nr);
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_L(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_rows - vc->vc_y)
@@ -1566,7 +1566,7 @@ static void csi_L(struct vc_data *vc, unsigned int nr)
         vc->vc_need_wrap = 0;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_P(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_cols - vc->vc_x)
@@ -1576,7 +1576,7 @@ static void csi_P(struct vc_data *vc, unsigned int nr)
         delete_char(vc, nr);
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_M(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_rows - vc->vc_y)
@@ -1587,7 +1587,7 @@ static void csi_M(struct vc_data *vc, unsigned int nr)
         vc->vc_need_wrap = 0;
 }
 
-/* console_sem is held (except via vc_init->reset_terminal */
+/* console_lock is held (except via vc_init->reset_terminal */
 static void save_cur(struct vc_data *vc)
 {
         vc->vc_saved_x          = vc->vc_x;
@@ -1603,7 +1603,7 @@ static void save_cur(struct vc_data *vc)
         vc->vc_saved_G1         = vc->vc_G1_charset;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void restore_cur(struct vc_data *vc)
 {
         gotoxy(vc, vc->vc_saved_x, vc->vc_saved_y);
@@ -1625,7 +1625,7 @@ enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey,
         EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
         ESpalette };
 
-/* console_sem is held (except via vc_init()) */
+/* console_lock is held (except via vc_init()) */
 static void reset_terminal(struct vc_data *vc, int do_clear)
 {
         vc->vc_top              = 0;
@@ -1685,7 +1685,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
             csi_J(vc, 2);
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
 {
         /*
@@ -2119,7 +2119,7 @@ static int is_double_width(uint32_t ucs)
         return bisearch(ucs, double_width, ARRAY_SIZE(double_width) - 1);
 }
 
-/* acquires console_sem */
+/* acquires console_lock */
 static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
 #ifdef VT_BUF_VRAM_ONLY
@@ -2147,11 +2147,11 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 
         might_sleep();
 
-        acquire_console_sem();
+        console_lock();
         vc = tty->driver_data;
         if (vc == NULL) {
                 printk(KERN_ERR "vt: argh, driver_data is NULL !\n");
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -2159,7 +2159,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
         if (!vc_cons_allocated(currcons)) {
             /* could this happen? */
                 printk_once("con_write: tty %d not allocated\n", currcons+1);
-            release_console_sem();
+            console_unlock();
             return 0;
         }
 
@@ -2375,7 +2375,7 @@ rescan_last_byte:
         }
         FLUSH
         console_conditional_schedule();
-        release_console_sem();
+        console_unlock();
         notify_update(vc);
         return n;
 #undef FLUSH
@@ -2388,11 +2388,11 @@ rescan_last_byte:
  * us to do the switches asynchronously (needed when we want
  * to switch due to a keyboard interrupt).  Synchronization
  * with other console code and prevention of re-entrancy is
- * ensured with console_sem.
+ * ensured with console_lock.
  */
 static void console_callback(struct work_struct *ignored)
 {
-        acquire_console_sem();
+        console_lock();
 
         if (want_console >= 0) {
                 if (want_console != fg_console &&
@@ -2422,7 +2422,7 @@ static void console_callback(struct work_struct *ignored)
         }
         notify_update(vc_cons[fg_console].d);
 
-        release_console_sem();
+        console_unlock();
 }
 
 int set_console(int nr)
@@ -2603,7 +2603,7 @@ static struct console vt_console_driver = {
  */
 
 /*
- * Generally a bit racy with respect to console_sem().
+ * Generally a bit racy with respect to console_lock();.
  *
  * There are some functions which don't need it.
  *
@@ -2629,17 +2629,17 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
         switch (type)
         {
                 case TIOCL_SETSEL:
-                        acquire_console_sem();
+                        console_lock();
                         ret = set_selection((struct tiocl_selection __user *)(p+1), tty);
-                        release_console_sem();
+                        console_unlock();
                         break;
                 case TIOCL_PASTESEL:
                         ret = paste_selection(tty);
                         break;
                 case TIOCL_UNBLANKSCREEN:
-                        acquire_console_sem();
+                        console_lock();
                         unblank_screen();
-                        release_console_sem();
+                        console_unlock();
                         break;
                 case TIOCL_SELLOADLUT:
                         ret = sel_loadlut(p);
@@ -2688,10 +2688,10 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         }
                         break;
                 case TIOCL_BLANKSCREEN: /* until explicitly unblanked, not only poked */
-                        acquire_console_sem();
+                        console_lock();
                         ignore_poke = 1;
                         do_blank_screen(0);
-                        release_console_sem();
+                        console_unlock();
                         break;
                 case TIOCL_BLANKEDSCREEN:
                         ret = console_blanked;
@@ -2790,11 +2790,11 @@ static void con_flush_chars(struct tty_struct *tty)
                 return;
 
         /* if we race with con_close(), vt may be null */
-        acquire_console_sem();
+        console_lock();
         vc = tty->driver_data;
         if (vc)
                 set_cursor(vc);
-        release_console_sem();
+        console_unlock();
 }
 
 /*
@@ -2805,7 +2805,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
         unsigned int currcons = tty->index;
         int ret = 0;
 
-        acquire_console_sem();
+        console_lock();
         if (tty->driver_data == NULL) {
                 ret = vc_allocate(currcons);
                 if (ret == 0) {
@@ -2813,7 +2813,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
 
                         /* Still being freed */
                         if (vc->port.tty) {
-                                release_console_sem();
+                                console_unlock();
                                 return -ERESTARTSYS;
                         }
                         tty->driver_data = vc;
@@ -2827,11 +2827,11 @@ static int con_open(struct tty_struct *tty, struct file *filp)
                                 tty->termios->c_iflag |= IUTF8;
                         else
                                 tty->termios->c_iflag &= ~IUTF8;
-                        release_console_sem();
+                        console_unlock();
                         return ret;
                 }
         }
-        release_console_sem();
+        console_unlock();
         return ret;
 }
 
@@ -2844,9 +2844,9 @@ static void con_shutdown(struct tty_struct *tty)
 {
         struct vc_data *vc = tty->driver_data;
         BUG_ON(vc == NULL);
-        acquire_console_sem();
+        console_lock();
         vc->port.tty = NULL;
-        release_console_sem();
+        console_unlock();
         tty_shutdown(tty);
 }
 
@@ -2893,13 +2893,13 @@ static int __init con_init(void)
         struct vc_data *vc;
         unsigned int currcons = 0, i;
 
-        acquire_console_sem();
+        console_lock();
 
         if (conswitchp)
                 display_desc = conswitchp->con_startup();
         if (!display_desc) {
                 fg_console = 0;
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -2946,7 +2946,7 @@ static int __init con_init(void)
         printable = 1;
         printk("\n");
 
-        release_console_sem();
+        console_unlock();
 
 #ifdef CONFIG_VT_CONSOLE
         register_console(&vt_console_driver);
@@ -3037,7 +3037,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
         if (!try_module_get(owner))
                 return -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         /* check if driver is registered */
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
@@ -3122,7 +3122,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
 
         retval = 0;
 err:
-        release_console_sem();
+        console_unlock();
         module_put(owner);
         return retval;
 };
@@ -3171,7 +3171,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         if (!try_module_get(owner))
                 return -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         /* check if driver is registered and if it is unbindable */
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
@@ -3185,7 +3185,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         }
 
         if (retval) {
-                release_console_sem();
+                console_unlock();
                 goto err;
         }
 
@@ -3204,12 +3204,12 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         }
 
         if (retval) {
-                release_console_sem();
+                console_unlock();
                 goto err;
         }
 
         if (!con_is_bound(csw)) {
-                release_console_sem();
+                console_unlock();
                 goto err;
         }
 
@@ -3238,7 +3238,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         if (!con_is_bound(csw))
                 con_driver->flag &= ~CON_DRIVER_FLAG_INIT;
 
-        release_console_sem();
+        console_unlock();
         /* ignore return value, binding should not fail */
         bind_con_driver(defcsw, first, last, deflt);
 err:
@@ -3538,7 +3538,7 @@ int register_con_driver(const struct consw *csw, int first, int last)
         if (!try_module_get(owner))
                 return -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
                 con_driver = &registered_con_driver[i];
@@ -3592,7 +3592,7 @@ int register_con_driver(const struct consw *csw, int first, int last)
         }
 
 err:
-        release_console_sem();
+        console_unlock();
         module_put(owner);
         return retval;
 }
@@ -3613,7 +3613,7 @@ int unregister_con_driver(const struct consw *csw)
 {
         int i, retval = -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         /* cannot unregister a bound driver */
         if (con_is_bound(csw))
@@ -3639,7 +3639,7 @@ int unregister_con_driver(const struct consw *csw)
                 }
         }
 err:
-        release_console_sem();
+        console_unlock();
         return retval;
 }
 EXPORT_SYMBOL(unregister_con_driver);
@@ -3934,9 +3934,9 @@ int con_set_cmap(unsigned char __user *arg)
 {
         int rc;
 
-        acquire_console_sem();
+        console_lock();
         rc = set_get_cmap (arg,1);
-        release_console_sem();
+        console_unlock();
 
         return rc;
 }
@@ -3945,9 +3945,9 @@ int con_get_cmap(unsigned char __user *arg)
 {
         int rc;
 
-        acquire_console_sem();
+        console_lock();
         rc = set_get_cmap (arg,0);
-        release_console_sem();
+        console_unlock();
 
         return rc;
 }
@@ -3994,12 +3994,12 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
         } else
                 font.data = NULL;
 
-        acquire_console_sem();
+        console_lock();
         if (vc->vc_sw->con_font_get)
                 rc = vc->vc_sw->con_font_get(vc, &font);
         else
                 rc = -ENOSYS;
-        release_console_sem();
+        console_unlock();
 
         if (rc)
                 goto out;
@@ -4076,12 +4076,12 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op)
         font.data = memdup_user(op->data, size);
         if (IS_ERR(font.data))
                 return PTR_ERR(font.data);
-        acquire_console_sem();
+        console_lock();
         if (vc->vc_sw->con_font_set)
                 rc = vc->vc_sw->con_font_set(vc, &font, op->flags);
         else
                 rc = -ENOSYS;
-        release_console_sem();
+        console_unlock();
         kfree(font.data);
         return rc;
 }
@@ -4103,12 +4103,12 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op)
         else
                 name[MAX_FONT_NAME - 1] = 0;
 
-        acquire_console_sem();
+        console_lock();
         if (vc->vc_sw->con_font_default)
                 rc = vc->vc_sw->con_font_default(vc, &font, s);
         else
                 rc = -ENOSYS;
-        release_console_sem();
+        console_unlock();
         if (!rc) {
                 op->width = font.width;
                 op->height = font.height;
@@ -4124,7 +4124,7 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
         if (vc->vc_mode != KD_TEXT)
                 return -EINVAL;
 
-        acquire_console_sem();
+        console_lock();
         if (!vc->vc_sw->con_font_copy)
                 rc = -ENOSYS;
         else if (con < 0 || !vc_cons_allocated(con))
@@ -4133,7 +4133,7 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
                 rc = 0;
         else
                 rc = vc->vc_sw->con_font_copy(vc, con);
-        release_console_sem();
+        console_unlock();
         return rc;
 }
 
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 6b68a0fb4611..1235ebda6e1c 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -649,12 +649,12 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 /*
                  * explicitly blank/unblank the screen if switching modes
                  */
-                acquire_console_sem();
+                console_lock();
                 if (arg == KD_TEXT)
                         do_unblank_screen(1);
                 else
                         do_blank_screen(1);
-                release_console_sem();
+                console_unlock();
                 break;
 
         case KDGETMODE:
@@ -893,7 +893,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         ret = -EINVAL;
                         goto out;
                 }
-                acquire_console_sem();
+                console_lock();
                 vc->vt_mode = tmp;
                 /* the frsig is ignored, so we set it to 0 */
                 vc->vt_mode.frsig = 0;
@@ -901,7 +901,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 vc->vt_pid = get_pid(task_pid(current));
                 /* no switch is required -- saw@shade.msu.ru */
                 vc->vt_newvt = -1;
-                release_console_sem();
+                console_unlock();
                 break;
         }
 
@@ -910,9 +910,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 struct vt_mode tmp;
                 int rc;
 
-                acquire_console_sem();
+                console_lock();
                 memcpy(&tmp, &vc->vt_mode, sizeof(struct vt_mode));
-                release_console_sem();
+                console_unlock();
 
                 rc = copy_to_user(up, &tmp, sizeof(struct vt_mode));
                 if (rc)
@@ -965,9 +965,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         ret =  -ENXIO;
                 else {
                         arg--;
-                        acquire_console_sem();
+                        console_lock();
                         ret = vc_allocate(arg);
-                        release_console_sem();
+                        console_unlock();
                         if (ret)
                                 break;
                         set_console(arg);
@@ -990,7 +990,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         ret = -ENXIO;
                 else {
                         vsa.console--;
-                        acquire_console_sem();
+                        console_lock();
                         ret = vc_allocate(vsa.console);
                         if (ret == 0) {
                                 struct vc_data *nvc;
@@ -1003,7 +1003,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                 put_pid(nvc->vt_pid);
                                 nvc->vt_pid = get_pid(task_pid(current));
                         }
-                        release_console_sem();
+                        console_unlock();
                         if (ret)
                                 break;
                         /* Commence switch and lock */
@@ -1044,7 +1044,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 /*
                  * Switching-from response
                  */
-                acquire_console_sem();
+                console_lock();
                 if (vc->vt_newvt >= 0) {
                         if (arg == 0)
                                 /*
@@ -1063,7 +1063,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                 vc->vt_newvt = -1;
                                 ret = vc_allocate(newvt);
                                 if (ret) {
-                                        release_console_sem();
+                                        console_unlock();
                                         break;
                                 }
                                 /*
@@ -1083,7 +1083,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         if (arg != VT_ACKACQ)
                                 ret = -EINVAL;
                 }
-                release_console_sem();
+                console_unlock();
                 break;
 
          /*
@@ -1096,20 +1096,20 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 }
                 if (arg == 0) {
                     /* deallocate all unused consoles, but leave 0 */
-                        acquire_console_sem();
+                        console_lock();
                         for (i=1; i<MAX_NR_CONSOLES; i++)
                                 if (! VT_BUSY(i))
                                         vc_deallocate(i);
-                        release_console_sem();
+                        console_unlock();
                 } else {
                         /* deallocate a single console, if possible */
                         arg--;
                         if (VT_BUSY(arg))
                                 ret = -EBUSY;
                         else if (arg) {                       /* leave 0 */
-                                acquire_console_sem();
+                                console_lock();
                                 vc_deallocate(arg);
-                                release_console_sem();
+                                console_unlock();
                         }
                 }
                 break;
@@ -1126,7 +1126,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                     get_user(cc, &vtsizes->v_cols))
                         ret = -EFAULT;
                 else {
-                        acquire_console_sem();
+                        console_lock();
                         for (i = 0; i < MAX_NR_CONSOLES; i++) {
                                 vc = vc_cons[i].d;
 
@@ -1135,7 +1135,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                         vc_resize(vc_cons[i].d, cc, ll);
                                 }
                         }
-                        release_console_sem();
+                        console_unlock();
                 }
                 break;
         }
@@ -1187,14 +1187,14 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 for (i = 0; i < MAX_NR_CONSOLES; i++) {
                         if (!vc_cons[i].d)
                                 continue;
-                        acquire_console_sem();
+                        console_lock();
                         if (vlin)
                                 vc_cons[i].d->vc_scan_lines = vlin;
                         if (clin)
                                 vc_cons[i].d->vc_font.height = clin;
                         vc_cons[i].d->vc_resize_user = 1;
                         vc_resize(vc_cons[i].d, cc, ll);
-                        release_console_sem();
+                        console_unlock();
                 }
                 break;
         }
@@ -1367,7 +1367,7 @@ void vc_SAK(struct work_struct *work)
         struct vc_data *vc;
         struct tty_struct *tty;
 
-        acquire_console_sem();
+        console_lock();
         vc = vc_con->d;
         if (vc) {
                 tty = vc->port.tty;
@@ -1379,7 +1379,7 @@ void vc_SAK(struct work_struct *work)
                         __do_SAK(tty);
                 reset_vc(vc);
         }
-        release_console_sem();
+        console_unlock();
 }
 
 #ifdef CONFIG_COMPAT
@@ -1737,10 +1737,10 @@ int vt_move_to_console(unsigned int vt, int alloc)
 {
         int prev;
 
-        acquire_console_sem();
+        console_lock();
         /* Graphics mode - up to X */
         if (disable_vt_switch) {
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
         prev = fg_console;
@@ -1748,7 +1748,7 @@ int vt_move_to_console(unsigned int vt, int alloc)
         if (alloc && vc_allocate(vt)) {
                 /* we can't have a free VC for now. Too bad,
                  * we don't want to mess the screen for now. */
-                release_console_sem();
+                console_unlock();
                 return -ENOSPC;
         }
 
@@ -1758,10 +1758,10 @@ int vt_move_to_console(unsigned int vt, int alloc)
                  * Let the calling function know so it can decide
                  * what to do.
                  */
-                release_console_sem();
+                console_unlock();
                 return -EIO;
         }
-        release_console_sem();
+        console_unlock();
         tty_lock();
         if (vt_waitactive(vt + 1)) {
                 pr_debug("Suspend: Can't switch VCs.");
@@ -1781,8 +1781,8 @@ int vt_move_to_console(unsigned int vt, int alloc)
  */
 void pm_set_vt_switch(int do_switch)
 {
-        acquire_console_sem();
+        console_lock();
         disable_vt_switch = !do_switch;
-        release_console_sem();
+        console_unlock();
 }
 EXPORT_SYMBOL(pm_set_vt_switch);