From: Petr Mladek <pmladek@suse.com>
Date: Thu, 19 Jan 2023 13:56:38 +0000 (+0100)
Subject: Merge branch 'rework/console-list-lock' into for-linus
X-Git-Tag: v6.2-rc5~26^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=21493c6e96e550509ead696ecca9f0d7196ee91c;hp=-c;p=linux-block.git

Merge branch 'rework/console-list-lock' into for-linus
---

21493c6e96e550509ead696ecca9f0d7196ee91c
diff --combined kernel/printk/printk.c
index 7decf1e9c486,39221b0f918d..a5ed2e53547c
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -123,6 -123,7 +123,7 @@@ bool console_srcu_read_lock_is_held(voi
  {
  	return srcu_read_lock_held(&console_srcu);
  }
+ EXPORT_SYMBOL(console_srcu_read_lock_is_held);
  #endif
  
  enum devkmsg_log_bits {
@@@ -1891,6 -1892,7 +1892,7 @@@ static void console_lock_spinning_enabl
  /**
   * console_lock_spinning_disable_and_check - mark end of code where another
   *	thread was able to busy wait and check if there is a waiter
+  * @cookie: cookie returned from console_srcu_read_lock()
   *
   * This is called at the end of the section where spinning is allowed.
   * It has two functions. First, it is a signal that it is no longer
@@@ -2480,7 -2482,7 +2482,7 @@@ static int __add_preferred_console(cha
  		return -E2BIG;
  	if (!brl_options)
  		preferred_console = i;
 -	strlcpy(c->name, name, sizeof(c->name));
 +	strscpy(c->name, name, sizeof(c->name));
  	c->options = options;
  	set_user_specified(c, user_specified);
  	braille_set_options(c, brl_options);