Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276539
b: refs/heads/master
c: 09dc3cf
h: refs/heads/master
i:
  276537: d06be67
  276535: 752692a
v: v3
  • Loading branch information
Peter Zijlstra authored and Linus Torvalds committed Dec 9, 2011
1 parent e2af71e commit a9bd711
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c193c82f054195aa352ccbef91afc28446e5a30e
refs/heads/master: 09dc3cf93f7d16fdd37a0ad8486faebb5e2769ec
3 changes: 2 additions & 1 deletion trunk/kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1293,10 +1293,11 @@ void console_unlock(void)
raw_spin_lock(&logbuf_lock);
if (con_start != log_end)
retry = 1;
raw_spin_unlock_irqrestore(&logbuf_lock, flags);

if (retry && console_trylock())
goto again;

raw_spin_unlock_irqrestore(&logbuf_lock, flags);
if (wake_klogd)
wake_up_klogd();
}
Expand Down

0 comments on commit a9bd711

Please sign in to comment.