Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11ca75d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk 

Pull printk updates from Petr Mladek:

 - print the warning about dropped messages on consoles on a separate
   line.   It makes it more legible.

 - one typo fix and small code clean up.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  added new line symbol after warning about dropped messages
  printk: fix typo in printk_safe.c
  printk: simplify no_printk()
parents e1d1ea54 9afe77ed

include/linux/printk.h

+2 −4
Original line number Diff line number Diff line
@@ -132,10 +132,8 @@ struct va_format { 
 */

#define no_printk(fmt, ...)				\

({							\

	do {						\

	if (0)						\

		printk(fmt, ##__VA_ARGS__);		\

	} while (0);					\

	0;						\

})

kernel/printk/printk.c

+1 −1
Original line number Diff line number Diff line
@@ -2190,7 +2190,7 @@ void console_unlock(void) 
		}



		if (console_seq < log_first_seq) {

			len = sprintf(text, "** %u printk messages dropped ** ",

			len = sprintf(text, "** %u printk messages dropped **\n",

				      (unsigned)(log_first_seq - console_seq));



			/* messages are gone, move to first one */

kernel/printk/printk_safe.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void queue_flush_work(struct printk_safe_seq_buf *s) 
 * have dedicated buffers, because otherwise printk-safe preempted by

 * NMI-printk would have overwritten the NMI messages.

 *

 * The messages are fushed from irq work (or from panic()), possibly,

 * The messages are flushed from irq work (or from panic()), possibly,

 * from other CPU, concurrently with printk_safe_log_store(). Should this

 * happen, printk_safe_log_store() will notice the buffer->len mismatch

 * and repeat the write.