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

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

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index ca5146006b94c6742ac770323aaf123688d65572..adf99c05adcafc494a003294e0de525005271df6 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2009,6 +2009,12 @@ static int console_trylock_spinning(void)
         */
        mutex_acquire(&console_lock_dep_map, 0, 1, _THIS_IP_);
 
+       /*
+        * Update @console_may_schedule for trylock because the previous
+        * owner may have been schedulable.
+        */
+       console_may_schedule = 0;
+
        return 1;
 }