From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762606AbdEWJDc (ORCPT ); Tue, 23 May 2017 05:03:32 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47529 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757649AbdEWJD0 (ORCPT ); Tue, 23 May 2017 05:03:26 -0400 Date: Tue, 23 May 2017 01:50:34 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: gregkh@linuxfoundation.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, peterz@infradead.org, tglx@linutronix.de, mpe@ellerman.id.au, paulus@samba.org, torvalds@linux-foundation.org, mingo@kernel.org, hpa@zytor.com, mark.rutland@arm.com Reply-To: peterz@infradead.org, tglx@linutronix.de, mpe@ellerman.id.au, paulus@samba.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org, benh@kernel.crashing.org, hpa@zytor.com, mark.rutland@arm.com, torvalds@linux-foundation.org, mingo@kernel.org In-Reply-To: <20170516184735.359536998@linutronix.de> References: <20170516184735.359536998@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] powerpc: Adjust system_state check Git-Commit-ID: a8fcfc1917681ba1ccc23a429543a67aad8bfd00 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: a8fcfc1917681ba1ccc23a429543a67aad8bfd00 Gitweb: http://git.kernel.org/tip/a8fcfc1917681ba1ccc23a429543a67aad8bfd00 Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:37 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:35 +0200 powerpc: 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_generic_cpu_bootable() to handle the extra states. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Acked-by: Michael Ellerman Cc: Benjamin Herrenschmidt Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Mark Rutland Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Steven Rostedt Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/20170516184735.359536998@linutronix.de Signed-off-by: Ingo Molnar --- arch/powerpc/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index df2a416..1069f74 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -97,7 +97,7 @@ int smp_generic_cpu_bootable(unsigned int nr) /* Special case - we inhibit secondary thread startup * during boot if the user requests it. */ - if (system_state == SYSTEM_BOOTING && cpu_has_feature(CPU_FTR_SMT)) { + if (system_state < SYSTEM_RUNNING && cpu_has_feature(CPU_FTR_SMT)) { if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0) return 0; if (smt_enabled_at_boot