aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Ospite <ao2@ao2.it>2015-06-30 17:59:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-30 22:44:59 -0400
commitb389645f041a9fc650819b1c1ce7abbef7f4912d (patch)
tree765f0127f54e24117005f28be9a3e277b033f242
parent9b597fd3c9d6864c580e75f390f1d2d104be6cbc (diff)
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>
-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 de553849f3ac..cf8c24203368 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -207,14 +207,14 @@ static int console_may_schedule;
207 * need to be changed in the future, when the requirements change. 207 * need to be changed in the future, when the requirements change.
208 * 208 *
209 * /dev/kmsg exports the structured data in the following line format: 209 * /dev/kmsg exports the structured data in the following line format:
210 * "<level>,<sequnum>,<timestamp>,<contflag>;<message text>\n" 210 * "<level>,<sequnum>,<timestamp>,<contflag>[,additional_values, ... ];<message text>\n"
211 *
212 * Users of the export format should ignore possible additional values
213 * separated by ',', and find the message after the ';' character.
211 * 214 *
212 * The optional key/value pairs are attached as continuation lines starting 215 * The optional key/value pairs are attached as continuation lines starting
213 * with a space character and terminated by a newline. All possible 216 * with a space character and terminated by a newline. All possible
214 * non-prinatable characters are escaped in the "\xff" notation. 217 * non-prinatable characters are escaped in the "\xff" notation.
215 *
216 * Users of the export format should ignore possible additional values
217 * separated by ',', and find the message after the ';' character.
218 */ 218 */
219 219
220enum log_flags { 220enum log_flags {