[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20140319094517.GC26358@quack.suse.cz>
Date: Wed, 19 Mar 2014 10:45:17 +0100
From: Jan Kara <jack@...e.cz>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: LKML <linux-kernel@...r.kernel.org>
Subject: printk: One small fixup for patch 5/8
Hello,
this is a small fixup for the patch 5/8 (printk: Hand over printing to
console if printing too long) in my printk series. It fixes a bogus warning
on non-preemptible kernels. Please just fold it into that patch (I can
resend the patch or the series but I don't think that's necessary for such
a small fixup).
Signed-off-by: Jan Kara <jack@...e.cz>
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 0910e1894224..cb7e06850eb5 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2022,7 +2022,7 @@ EXPORT_SYMBOL(console_trylock);
*/
static int console_lock_try_spin(void)
{
- WARN_ON_ONCE(!in_atomic());
+ WARN_ON_ONCE(preemptible());
/* Someone already spinning? Don't waste cpu time... */
if (test_and_set_bit(PRINTK_CONSOLE_SPIN_B, &printk_handover_state))
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists