summaryrefslogtreecommitdiff
path: root/kernel/printk
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-05-16 21:42:45 +0300
committerIngo Molnar <mingo@kernel.org>2017-05-23 11:01:37 +0300
commitff48cd26fc4889b9deb5f9333d3c61746e450b7f (patch)
treeadd853fa6968ec73d8a54757cd0718b0b345ebed /kernel/printk
parent0594729c24d846889408a07057b5cc9e8d931419 (diff)
downloadlinux-ff48cd26fc4889b9deb5f9333d3c61746e450b7f.tar.xz
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>
Diffstat (limited to 'kernel/printk')
-rw-r--r--kernel/printk/printk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a1aecf44ab07..32fac391ac2a 100644
--- 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;
}