Commit f97960fb authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

kernel/printk: Block cpuhotplug callback when tasks are frozen

The recent conversion of the console hotplug notifier to the state machine
missed the fact, that the notifier only operated on the non frozen
transitions. As a consequence the console_lock/unlock() pair is also
invoked during suspend, which results in a lockdep warning.

Restore the previous state by making the lock/unlock conditional on
!tasks_frozen.

Fixes: 90b14889

 ("kernel/printk: Convert to hotplug state machine")
Reported-and-tested-by: default avatarBorislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1611171729320.3645@nanos

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
parent 0e285d36
......@@ -2194,8 +2194,10 @@ void resume_console(void)
*/
static int console_cpu_notify(unsigned int cpu)
{
console_lock();
console_unlock();
if (!cpuhp_tasks_frozen) {
console_lock();
console_unlock();
}
return 0;
}
......
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