From a9bd711fa279e36bc5fdf1865de0249c90b4ac51 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Thu, 8 Dec 2011 14:34:13 -0800 Subject: [PATCH] --- yaml --- r: 276539 b: refs/heads/master c: 09dc3cf93f7d16fdd37a0ad8486faebb5e2769ec h: refs/heads/master i: 276537: d06be670db5649eb99cf4fc48688998647676666 276535: 752692aaf0b4650815cde5137023fad5e50b5ecd v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9d7eef5eb283..2da0479ab57c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c193c82f054195aa352ccbef91afc28446e5a30e +refs/heads/master: 09dc3cf93f7d16fdd37a0ad8486faebb5e2769ec diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 1455a0d4eedd..7982a0a841ea 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -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(); }