From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760966AbdEWIyS (ORCPT ); Tue, 23 May 2017 04:54:18 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52087 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752181AbdEWIyP (ORCPT ); Tue, 23 May 2017 04:54:15 -0400 Date: Tue, 23 May 2017 01:49:24 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: torvalds@linux-foundation.org, gregkh@linuxfoundation.org, mingo@kernel.org, peterz@infradead.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, hpa@zytor.com, rostedt@goodmis.org, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, rostedt@goodmis.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, mark.rutland@arm.com, peterz@infradead.org, mingo@kernel.org In-Reply-To: <20170516184735.191715856@linutronix.de> References: <20170516184735.191715856@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] x86/smp: Adjust system_state check Git-Commit-ID: 719b3680d1f789c1e3054e3fcb26bfff07c3c623 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: 719b3680d1f789c1e3054e3fcb26bfff07c3c623 Gitweb: http://git.kernel.org/tip/719b3680d1f789c1e3054e3fcb26bfff07c3c623 Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:35 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:35 +0200 x86/smp: Adjust system_state check 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 announce_cpu() to handle the extra states. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Steven Rostedt (VMware) Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Mark Rutland Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170516184735.191715856@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/smpboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index f04479a..045e4f9 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -863,7 +863,7 @@ static void announce_cpu(int cpu, int apicid) if (cpu == 1) printk(KERN_INFO "x86: Booting SMP configuration:\n"); - if (system_state == SYSTEM_BOOTING) { + if (system_state < SYSTEM_RUNNING) { if (node != current_node) { if (current_node > (-1)) pr_cont("\n");