diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-06-25 10:01:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-25 10:01:04 +1000 |
| commit | febc36efc07ed8c3288523655ab7594f552e496b (patch) | |
| tree | 082a0c14a7a2ab41b9e0e453d9f0df20f38c35d7 | |
| parent | 5f7bcedf0c3aef165aefb438b165663a8cd3a902 (diff) | |
misc:down_nowait-kernel_printk
down_trylock -> down_try in kernel/printk.c
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | kernel/printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 8fb01c32aa3b..2b57c8892615 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -986,7 +986,7 @@ EXPORT_SYMBOL(acquire_console_sem); int try_acquire_console_sem(void) { - if (down_trylock(&console_sem)) + if (!down_try(&console_sem)) return -1; console_locked = 1; console_may_schedule = 0; @@ -1083,7 +1083,7 @@ void console_unblank(void) * oops_in_progress is set to 1.. */ if (oops_in_progress) { - if (down_trylock(&console_sem) != 0) + if (!down_try(&console_sem)) return; } else acquire_console_sem(); |