moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2017-11-21 05:28:13 -10:00
parent e1d1ea549b 9afe77ed84
commit 11ca75d2d6
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/printk.h
View File

@@ -132,10 +132,8 @@ struct va_format {
*/ */
#define no_printk(fmt, ...) \ #define no_printk(fmt, ...) \
({ \ ({ \
do { \ if (0) \
if (0) \ printk(fmt, ##__VA_ARGS__); \
printk(fmt, ##__VA_ARGS__); \
} while (0); \
0; \ 0; \
}) })

2
kernel/printk/printk.c
View File

@@ -2190,7 +2190,7 @@ again:
} }
if (console_seq < log_first_seq) { 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)); (unsigned)(log_first_seq - console_seq));
/* messages are gone, move to first one */ /* messages are gone, move to first one */

2
kernel/printk/printk_safe.c
View File

@@ -72,7 +72,7 @@ static void queue_flush_work(struct printk_safe_seq_buf *s)
* have dedicated buffers, because otherwise printk-safe preempted by * have dedicated buffers, because otherwise printk-safe preempted by
* NMI-printk would have overwritten the NMI messages. * 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 * from other CPU, concurrently with printk_safe_log_store(). Should this
* happen, printk_safe_log_store() will notice the buffer->len mismatch * happen, printk_safe_log_store() will notice the buffer->len mismatch
* and repeat the write. * and repeat the write.