Merge tag 'printk-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jan 2020 22:53:23 +0000 (14:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jan 2020 22:53:23 +0000 (14:53 -0800)
Pull printk update from Petr Mladek:
 "Prevent replaying log on all consoles"

* tag 'printk-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  printk: fix exclusive_console replaying

kernel/printk/printk.c

index 1ef6f75..fada22d 100644 (file)
@@ -2770,8 +2770,6 @@ void register_console(struct console *newcon)
                 * for us.
                 */
                logbuf_lock_irqsave(flags);
-               console_seq = syslog_seq;
-               console_idx = syslog_idx;
                /*
                 * We're about to replay the log buffer.  Only do this to the
                 * just-registered console to avoid excessive message spam to
@@ -2783,6 +2781,8 @@ void register_console(struct console *newcon)
                 */
                exclusive_console = newcon;
                exclusive_console_stop_seq = console_seq;
+               console_seq = syslog_seq;
+               console_idx = syslog_idx;
                logbuf_unlock_irqrestore(flags);
        }
        console_unlock();