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>
This commit is contained in:
committed by
Linus Torvalds
parent
3689456b4b
commit
ac751efa6a
@ -67,7 +67,7 @@ static void *c_start(struct seq_file *m, loff_t *pos)
|
||||
struct console *con;
|
||||
loff_t off = 0;
|
||||
|
||||
acquire_console_sem();
|
||||
console_lock();
|
||||
for_each_console(con)
|
||||
if (off++ == *pos)
|
||||
break;
|
||||
@ -84,7 +84,7 @@ static void *c_next(struct seq_file *m, void *v, loff_t *pos)
|
||||
|
||||
static void c_stop(struct seq_file *m, void *v)
|
||||
{
|
||||
release_console_sem();
|
||||
console_unlock();
|
||||
}
|
||||
|
||||
static const struct seq_operations consoles_op = {
|
||||
|
Reference in New Issue
Block a user