Merge tag 'printk-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...

[sfrench/cifs-2.6.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a9b7dade0d2ecd87dab1ddc80ca88f641095a621..fd0c9f913940acf3675cae278465b70ec76c4a87 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -123,6 +123,7 @@ bool console_srcu_read_lock_is_held(void)
 {
        return srcu_read_lock_held(&console_srcu);
 }
+EXPORT_SYMBOL(console_srcu_read_lock_is_held);
 #endif
 
 enum devkmsg_log_bits {
@@ -1869,6 +1870,7 @@ static void console_lock_spinning_enable(void)
 /**
  * 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
@@ -2151,7 +2153,7 @@ static u16 printk_sprint(char *text, u16 size, int facility,
                }
        }
 
-       trace_console_rcuidle(text, text_len);
+       trace_console(text, text_len);
 
        return text_len;
 }