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

[linux-2.6-block.git] / drivers / tty / tty_io.c

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 464d09d97873dd535df3d9ce9b481be7fa98db55..6158eae0f64a2e669f6c0d3887e7bc64163419ad 100644 (file)
--- 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;
 }