summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-07-05 15:30:26 +0200
committerKay Sievers <kay@vrfy.org>2012-07-05 15:34:27 +0200
commitfda71f238b68562454f806b2abc9b4f873327f0f (patch)
tree2dd16128e5b3e395a0f79f70dd56ff301769c696
parentfae6842f3b62fe72ffcfd3f68bc098b569a901b3 (diff)
downloadpatches-fda71f238b68562454f806b2abc9b4f873327f0f.tar.gz
add cons fix
-rw-r--r--kmsg-cons-fix.patch30
-rw-r--r--series1
2 files changed, 31 insertions, 0 deletions
diff --git a/kmsg-cons-fix.patch b/kmsg-cons-fix.patch
new file mode 100644
index 0000000..1109747
--- /dev/null
+++ b/kmsg-cons-fix.patch
@@ -0,0 +1,30 @@
+From: Kay Sievers <kay@vrfy.org>
+Subject: kmsg: make sure all messages reach a newly registered boot console
+
+We suppress printing kmsg records to the console, which are already printed
+immediately while we have received their fragments.
+
+Newly registered boot consoles print the entire kmsg buffer during
+registration. Clear the console-suppress flag after we skipped the record
+during its first storage, so any later print will see these records as usual.
+
+Signed-off-by: Kay Sievers <kay@vrfy.org>
+---
+ kernel/printk.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/kernel/printk.c
++++ b/kernel/printk.c
+@@ -1951,6 +1951,12 @@ skip:
+ */
+ console_idx = log_next(console_idx);
+ console_seq++;
++ /*
++ * We will get here again when we register a new
++ * CON_PRINTBUFFER console. Clear the flag so we
++ * will properly dump everything later.
++ */
++ msg->flags &= ~LOG_NOCONS;
+ goto skip;
+ }
+
diff --git a/series b/series
index 6d3b1ec..f23d26f 100644
--- a/series
+++ b/series
@@ -2,3 +2,4 @@ kmsg-escape.patch
kmsg-facility-len.patch
kmsg-nonblock-race.patch
test-modules.patch
+kmsg-cons-fix.patch