Skip to contentSkip to conversation

printk-sound-handle-more-message-headers.patch removed from -mm tree

merged [email protected] 1 participant 1 message Dec 14, 2016

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: printk/sound: handle more message headers
has been removed from the -mm tree. Its filename was
printk-sound-handle-more-message-headers.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Petr Mladek <[email protected]>
Subject: printk/sound: handle more message headers

4bcc595ccd80decb4245096e ("printk: reinstate KERN_CONT for printing continuation lines") allows to define more message headers for a single message. The motivation is that continuous lines might get mixed. Therefore it make sense to define the right log level for every piece of a cont line.

This patch allows to copy only the real message level. We should ignore KERN_CONT because <filename:line> is added for each message. By other words, we want to know where each piece of the line comes from.

[[email protected]: fix a check of the valid message level]
Link http://lkml.kernel.org/r/[email protected] open here
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Petr Mladek <[email protected]>
Cc Joe Perches <[email protected]>
Cc Sergey Senozhatsky <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Jason Wessel <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Chris Mason <[email protected]>
Cc Josef Bacik <[email protected]>
Cc David Sterba <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 sound/core/misc.c |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
sound/core/misc.c renamed from sound/core/misc.c~printk-sound-handle-more-message-headers +14 -6
diff -puN sound/core/misc.c~printk-sound-handle-more-message-headers sound/core/misc.c
@@ -71,6 +71,7 @@ void __snd_printk(unsigned int level, co
 	int kern_level;
 	struct va_format vaf;
 	char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";
+	bool level_found = false;
 #endif
 
 #ifdef CONFIG_SND_DEBUG

@@ -83,15 +84,22 @@ void __snd_printk(unsigned int level, co
 	vaf.fmt = format;
 	vaf.va = &args;
 
-	kern_level = printk_get_level(format);
-	if (kern_level) {
-		const char *end_of_header = printk_skip_level(format);
-		memcpy(verbose_fmt, format, end_of_header - format);
+	while ((kern_level = printk_get_level(vaf.fmt)) != 0) {
+		const char *end_of_header = printk_skip_level(vaf.fmt);
+
+		/* Ignore KERN_CONT. We print filename:line for each piece. */
+		if (kern_level >= '0' && kern_level <= '7') {
+			memcpy(verbose_fmt, vaf.fmt, end_of_header - vaf.fmt);
+			level_found = true;
+		}
+
 		vaf.fmt = end_of_header;
-	} else if (level)
+	}
+
+	if (!level_found && level)
 		memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
-	printk(verbose_fmt, sanity_file_name(path), line, &vaf);
 
+	printk(verbose_fmt, sanity_file_name(path), line, &vaf);
 #else
 	vprintk(format, args);
 #endif

_

Patches currently in -mm which might be from [email protected] are

kdb-remove-unused-kdb_event-handling.patch kdb-properly-synchronize-vkdb_printf-calls-with-other-cpus.patch kdb-call-vkdb_printf-from-vprintk_default-only-when-wanted.patch