Skip to contentSkip to conversation

printk: One small fixup for patch 5/8

PATCH Jan Kara 1 participant 1 message Mar 19, 2014 Printk

lore
Share & tools
lore

Jan Kara

author
#0 lore raw

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).

kernel/printk/printk.c +1 -1
index 0910e1894224..cb7e06850eb5 100644
@@ -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;