[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-ff48cd26fc4889b9deb5f9333d3c61746e450b7f@git.kernel.org>
Date: Tue, 23 May 2017 01:55:08 -0700
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, torvalds@...ux-foundation.org,
linux-kernel@...r.kernel.org, mark.rutland@....com,
peterz@...radead.org, gregkh@...uxfoundation.org, mingo@...nel.org,
tglx@...utronix.de, rostedt@...dmis.org
Subject: [tip:sched/core] printk: Adjust system_state checks
Commit-ID: ff48cd26fc4889b9deb5f9333d3c61746e450b7f
Gitweb: http://git.kernel.org/tip/ff48cd26fc4889b9deb5f9333d3c61746e450b7f
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Tue, 16 May 2017 20:42:45 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 23 May 2017 10:01:37 +0200
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@....com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Reviewed-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/20170516184736.027534895@linutronix.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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 a1aecf4..32fac39 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;
}
Powered by blists - more mailing lists