diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-05-14 18:54:14 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-05-14 18:54:14 +0200 |
| commit | 8c556ad44e089fe75e1dac058a3fd5219663b40f (patch) | |
| tree | b6301f26e5b1ac8e1f32743e18bac2ade5c4765d | |
| parent | 957e9ef2ae63748a93fa6513c40849263e5ecf21 (diff) | |
| download | patches-8c556ad44e089fe75e1dac058a3fd5219663b40f.tar.gz | |
update
| -rw-r--r-- | kmsg-sep-cont.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/kmsg-sep-cont.patch b/kmsg-sep-cont.patch index d2ef33a..146fa94 100644 --- a/kmsg-sep-cont.patch +++ b/kmsg-sep-cont.patch @@ -57,8 +57,8 @@ New behavior with separate and thread-aware continuation buffer: Signed-off-by: Kay Sievers <kay@vrfy.org> --- - kernel/printk.c | 108 +++++++++++++++++++++++++++++++------------------------- - 1 file changed, 60 insertions(+), 48 deletions(-) + kernel/printk.c | 113 ++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 65 insertions(+), 48 deletions(-) --- a/kernel/printk.c +++ b/kernel/printk.c @@ -101,7 +101,7 @@ Signed-off-by: Kay Sievers <kay@vrfy.org> if (text[0] == '<' && text[1] && text[2] == '>') { switch (text[1]) { case '0' ... '7': -@@ -1338,49 +1338,62 @@ asmlinkage int vprintk_emit(int facility +@@ -1338,49 +1338,67 @@ asmlinkage int vprintk_emit(int facility prefix = true; case 'c': /* KERN_CONT */ text += 3; @@ -147,6 +147,11 @@ Signed-off-by: Kay Sievers <kay@vrfy.org> + if (level == -1) + level = default_message_loglevel; + ++ if (dict) { ++ prefix = true; ++ newline = true; ++ } ++ + if (!newline) { + if (cont_len && (prefix || cont_task != current)) { + /* @@ -155,13 +160,13 @@ Signed-off-by: Kay Sievers <kay@vrfy.org> + */ + log_store(facility, cont_level, NULL, 0, cont_buf, cont_len); + cont_len = 0; -+ } + } +- cont = NULL; + + if (!cont_len) { + cont_level = level; + cont_task = current; - } -- cont = NULL; ++ } + + /* buffer or append to earlier buffer from the same thread */ + if (cont_len + text_len > sizeof(cont_buf)) @@ -202,7 +207,7 @@ Signed-off-by: Kay Sievers <kay@vrfy.org> } /* -@@ -1470,7 +1483,6 @@ EXPORT_SYMBOL(printk); +@@ -1470,7 +1488,6 @@ EXPORT_SYMBOL(printk); #define LOG_LINE_MAX 0 static struct log *log_from_idx(u32 idx) { return NULL; } static u32 log_next(u32 idx) { return 0; } |