[PATCH 4.4 v1 13/17] printk: Adjust system_state checks

[Kazuhiro Hayashi]

From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

commit ff48cd26fc4889b9deb5f9333d3c61746e450b7f upstream.

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.

Conflicts: kernel/printk/printk.c
cf775444 replace the third condition that boot_delay_msec() returns
immediately with suppress_message_printing(). This does not affect
system_state check.

Tested-by: Mark Rutland <mark.rutland@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Reviewed-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20170516184736.027534895@xxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Kazuhiro Hayashi <kazuhiro3.hayashi@xxxxxxxxxxxxx>
---
 kernel/printk/printk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index d8e0790f56cb..8d1e081bf9fc 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1077,7 +1077,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)
 		|| (level >= console_loglevel && !ignore_loglevel)) {
 		return;
 	}
-- 
2.30.2