* printk: One small fixup for patch 5/8
@ 2014-03-19 9:45 Jan Kara
0 siblings, 0 replies; only message in thread
From: Jan Kara @ 2014-03-19 9:45 UTC (permalink / raw)
To: Andrew Morton; +Cc: LKML
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@suse.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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-19 9:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-19 9:45 printk: One small fixup for patch 5/8 Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®