From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936644AbdEWIxb (ORCPT ); Tue, 23 May 2017 04:53:31 -0400 Received: from terminus.zytor.com ([65.50.211.136]:44453 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935955AbdEWIx2 (ORCPT ); Tue, 23 May 2017 04:53:28 -0400 Date: Tue, 23 May 2017 01:48:49 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: rostedt@goodmis.org, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, mingo@kernel.org, will.deacon@arm.com, mark.rutland@arm.com, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, will.deacon@arm.com, mingo@kernel.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, rostedt@goodmis.org In-Reply-To: <20170516184735.112589728@linutronix.de> References: <20170516184735.112589728@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] arm64: Adjust system_state check Git-Commit-ID: ef284f5ca5f102bf855e599305c0c16d6e844635 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: ef284f5ca5f102bf855e599305c0c16d6e844635 Gitweb: http://git.kernel.org/tip/ef284f5ca5f102bf855e599305c0c16d6e844635 Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:34 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:35 +0200 arm64: 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 smp_send_stop() to handle the extra states. Tested-by: Mark Rutland Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Acked-by: Mark Rutland Acked-by: Catalin Marinas Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Will Deacon Link: http://lkml.kernel.org/r/20170516184735.112589728@linutronix.de Signed-off-by: Ingo Molnar --- arch/arm64/kernel/smp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 6e0e16a..3211198 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -961,8 +961,7 @@ void smp_send_stop(void) cpumask_copy(&mask, cpu_online_mask); cpumask_clear_cpu(smp_processor_id(), &mask); - if (system_state == SYSTEM_BOOTING || - system_state == SYSTEM_RUNNING) + if (system_state <= SYSTEM_RUNNING) pr_crit("SMP: stopping secondary CPUs\n"); smp_cross_call(&mask, IPI_CPU_STOP); }