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
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user