summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAntonio Ospite <ao2@ao2.it>2015-06-30 14:59:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-30 19:44:59 -0700
commitb389645f041a9fc650819b1c1ce7abbef7f4912d (patch)
tree765f0127f54e24117005f28be9a3e277b033f242 /kernel
parent9b597fd3c9d6864c580e75f390f1d2d104be6cbc (diff)
downloadop-kernel-dev-b389645f041a9fc650819b1c1ce7abbef7f4912d.zip
op-kernel-dev-b389645f041a9fc650819b1c1ce7abbef7f4912d.tar.gz
printk: improve the description of /dev/kmsg line format
The comment about /dev/kmsg does not mention the additional values which may actually be exported, fix that. Also move up the part of the comment instructing the users to ignore these additional values, this way the reading is more fluent and logically compact. Signed-off-by: Antonio Ospite <ao2@ao2.it> Cc: Joe Perches <joe@perches.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index de55384..cf8c242 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -207,14 +207,14 @@ static int console_may_schedule;
* need to be changed in the future, when the requirements change.
*
* /dev/kmsg exports the structured data in the following line format:
- * "<level>,<sequnum>,<timestamp>,<contflag>;<message text>\n"
+ * "<level>,<sequnum>,<timestamp>,<contflag>[,additional_values, ... ];<message text>\n"
+ *
+ * Users of the export format should ignore possible additional values
+ * separated by ',', and find the message after the ';' character.
*
* The optional key/value pairs are attached as continuation lines starting
* with a space character and terminated by a newline. All possible
* non-prinatable characters are escaped in the "\xff" notation.
- *
- * Users of the export format should ignore possible additional values
- * separated by ',', and find the message after the ';' character.
*/
enum log_flags {
OpenPOWER on IntegriCloud