Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a4824bf authored by Petr Mladek's avatar Petr Mladek Committed by Linus Torvalds
Browse files

printk/sound: handle more message headers 

Commit 4bcc595c ("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.

[pmladek@suse.com: fix a check of the valid message level]
  Link: http://lkml.kernel.org/r/20161111183444.GE2145@dhcp128.suse.cz
Link: http://lkml.kernel.org/r/1478695291-12169-5-git-send-email-pmladek@suse.com


Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Cc: Joe Perches <joe@perches.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <jbacik@fb.com>
Cc: David Sterba <dsterba@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 262c5e86

sound/core/misc.c

+14 −6
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ void __snd_printk(unsigned int level, const char *path, int line, 
	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, const char *path, int line, 
	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