diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-07-08 19:00:19 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-07-08 19:00:19 +0200 |
| commit | 4ffdcd450aab78b7d178d28d8641345f759493c4 (patch) | |
| tree | 3fb3c3742b88be4a09699a02af9e6bbdcbea406b | |
| parent | c36eee64e84247407cd23bef18658fccf9f0da74 (diff) | |
| download | patches-4ffdcd450aab78b7d178d28d8641345f759493c4.tar.gz | |
add changelog
| -rw-r--r-- | kmsg-merge-cont.patch | 8 | ||||
| -rw-r--r-- | kmsg-syslog-1-byte-read.patch | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/kmsg-merge-cont.patch b/kmsg-merge-cont.patch index cb95b95..dc17f52 100644 --- a/kmsg-merge-cont.patch +++ b/kmsg-merge-cont.patch @@ -1,15 +1,15 @@ From: Kay Sievers <kay@vrfy.org> Subject: kmsg: merge continuation records while printing -In the unlikely case our continuation merge buffer is busy, we unfortunately +In (the unlikely) case our continuation merge buffer is busy, we unfortunately can not merge further continuation printk()s into a single record and have to store them separately, which leads to split-up output of these lines when they are printed. -Add some flags to these records and try to reconstruct the full line again, -when the separated records are printed. +Add some flags about newlines and prefix existence to these records and try to +reconstruct the full line again, when the separated records are printed. -Cc: Michael Neuling <mikey@neuling.org> +Reported-By: Michael Neuling <mikey@neuling.org> Signed-off-by: Kay Sievers <kay@vrfy.org> --- kernel/printk.c | 119 ++++++++++++++++++++++++++++++++++++-------------------- diff --git a/kmsg-syslog-1-byte-read.patch b/kmsg-syslog-1-byte-read.patch index 1cdde05..73c4cef 100644 --- a/kmsg-syslog-1-byte-read.patch +++ b/kmsg-syslog-1-byte-read.patch @@ -1,3 +1,16 @@ +From: Kay Sievers <kay@vrfy.org> +Subject: kmsg: /proc/kmsg - support reading of partial log records + +Restore support for partial reads of any size on /proc/kmsg, in case the +supplied read buffer is smaller than the record size. + +Some people seem to think is is ia good idea to run: + $ dd if=/proc/kmsg bs=1 of=... +as a klog bridge. + +Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=44211 +Reported-by: Jukka Ollila <jiiksteri@gmail.com> +Signed-off-by: Kay Sievers <kay@vrfy.org> --- kernel/printk.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) |