summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-21 05:28:13 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-21 05:28:13 -1000
commit11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be (patch)
treece03dc406fdb0e7a3d58e6506c1537c9fe9c98d3 /kernel
parente1d1ea549b57790a3d8cf6300e6ef86118d692a3 (diff)
parent9afe77ed849de6af8532b4c1b9310102eed9edf7 (diff)
downloadlinux-stable-11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be.tar.gz
linux-stable-11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be.tar.bz2
linux-stable-11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be.zip
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()
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c2
-rw-r--r--kernel/printk/printk_safe.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 512f7c2baedd..5d81206a572d 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2190,7 +2190,7 @@ again:
}
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 */
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
index 724d9292d4b9..3e3c2004bb23 100644
--- a/kernel/printk/printk_safe.c
+++ b/kernel/printk/printk_safe.c
@@ -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.