Commit ff48cd26 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

printk: Adjust system_state checks

To enable smp_processor_id() and might_sleep() debug checks earlier, it's
required to add system states between SYSTEM_BOOTING and SYSTEM_RUNNING.

Adjust the system_state check in boot_delay_msec() to handle the extra
states.
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170516184736.027534895@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0594729c
...@@ -1176,7 +1176,7 @@ static void boot_delay_msec(int level) ...@@ -1176,7 +1176,7 @@ static void boot_delay_msec(int level)
unsigned long long k; unsigned long long k;
unsigned long timeout; unsigned long timeout;
if ((boot_delay == 0 || system_state != SYSTEM_BOOTING) if ((boot_delay == 0 || system_state >= SYSTEM_RUNNING)
|| suppress_message_printing(level)) { || suppress_message_printing(level)) {
return; return;
} }
......
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