From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936815AbdEWI7x (ORCPT ); Tue, 23 May 2017 04:59:53 -0400 Received: from terminus.zytor.com ([65.50.211.136]:44557 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933016AbdEWI7u (ORCPT ); Tue, 23 May 2017 04:59:50 -0400 Date: Tue, 23 May 2017 01:55:08 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, mark.rutland@arm.com, peterz@infradead.org, gregkh@linuxfoundation.org, mingo@kernel.org, tglx@linutronix.de, rostedt@goodmis.org Reply-To: rostedt@goodmis.org, mingo@kernel.org, tglx@linutronix.de, gregkh@linuxfoundation.org, peterz@infradead.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com In-Reply-To: <20170516184736.027534895@linutronix.de> References: <20170516184736.027534895@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] printk: Adjust system_state checks Git-Commit-ID: ff48cd26fc4889b9deb5f9333d3c61746e450b7f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ff48cd26fc4889b9deb5f9333d3c61746e450b7f Gitweb: http://git.kernel.org/tip/ff48cd26fc4889b9deb5f9333d3c61746e450b7f Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:45 +0200 Committer: Ingo Molnar 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 Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Steven Rostedt (VMware) Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170516184736.027534895@linutronix.de Signed-off-by: Ingo Molnar --- 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; }