From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936742AbdEWIzE (ORCPT ); Tue, 23 May 2017 04:55:04 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50013 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936719AbdEWIy6 (ORCPT ); Tue, 23 May 2017 04:54:58 -0400 Date: Tue, 23 May 2017 01:48:15 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: torvalds@linux-foundation.org, rostedt@goodmis.org, peterz@infradead.org, mingo@kernel.org, linux@armlinux.org.uk, linux-kernel@vger.kernel.org, hpa@zytor.com, gregkh@linuxfoundation.org, mark.rutland@arm.com, tglx@linutronix.de Reply-To: mingo@kernel.org, peterz@infradead.org, rostedt@goodmis.org, torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, linux@armlinux.org.uk, mark.rutland@arm.com, gregkh@linuxfoundation.org, tglx@linutronix.de In-Reply-To: <20170516184735.020718977@linutronix.de> References: <20170516184735.020718977@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] arm: Adjust system_state check Git-Commit-ID: 5976a66913a8bf42465d96776fd37fb5631edc19 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: 5976a66913a8bf42465d96776fd37fb5631edc19 Gitweb: http://git.kernel.org/tip/5976a66913a8bf42465d96776fd37fb5631edc19 Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:33 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:35 +0200 arm: 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 ipi_cpu_stop() to handle the extra states. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Mark Rutland Cc: Peter Zijlstra Cc: Russell King Cc: Steven Rostedt Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20170516184735.020718977@linutronix.de Signed-off-by: Ingo Molnar --- arch/arm/kernel/smp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 572a8df..c9a0a52 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -555,8 +555,7 @@ static DEFINE_RAW_SPINLOCK(stop_lock); */ static void ipi_cpu_stop(unsigned int cpu) { - if (system_state == SYSTEM_BOOTING || - system_state == SYSTEM_RUNNING) { + if (system_state <= SYSTEM_RUNNING) { raw_spin_lock(&stop_lock); pr_crit("CPU%u: stopping\n", cpu); dump_stack();