Commit 7033999e authored by Linus Torvalds's avatar Linus Torvalds

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

Pull printk fix from Petr Mladek:

 - Prevent scheduling in an atomic context when printk() takes over the
   console flushing duty

* tag 'printk-for-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: Update @console_may_schedule in console_trylock_spinning()
parents 576bb2d8 80769724
...@@ -2009,6 +2009,12 @@ static int console_trylock_spinning(void) ...@@ -2009,6 +2009,12 @@ static int console_trylock_spinning(void)
*/ */
mutex_acquire(&console_lock_dep_map, 0, 1, _THIS_IP_); 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; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment