| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Tue, 16 May 2017 20:42:45 +0200 |
| Subject: [PATCH 14/17] 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: Mark Rutland <mark.rutland@arm.com> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Reviewed-by: Steven 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.de |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| --- |
| kernel/printk/printk.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/kernel/printk/printk.c |
| +++ b/kernel/printk/printk.c |
| @@ -1176,7 +1176,7 @@ static void boot_delay_msec(int level) |
| unsigned long long k; |
| unsigned long timeout; |
| |
| - if ((boot_delay == 0 || system_state != SYSTEM_BOOTING) |
| + if ((boot_delay == 0 || system_state >= SYSTEM_RUNNING) |
| || suppress_message_printing(level)) { |
| return; |
| } |