From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753254AbdK1Nrn (ORCPT ); Tue, 28 Nov 2017 08:47:43 -0500 Received: from terminus.zytor.com ([65.50.211.136]:33725 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753037AbdK1Nrk (ORCPT ); Tue, 28 Nov 2017 08:47:40 -0500 Date: Tue, 28 Nov 2017 05:43:00 -0800 From: tip-bot for Lai Jiangshan Message-ID: Cc: richard@nod.at, linux-kernel@vger.kernel.org, bigeasy@linutronix.de, jiangshanlai@gmail.com, boris.ostrovsky@oracle.com, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de Reply-To: boris.ostrovsky@oracle.com, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, richard@nod.at, jiangshanlai@gmail.com, bigeasy@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <20171128131954.81229-1-jiangshanlai@gmail.com> References: <20171128131954.81229-1-jiangshanlai@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/urgent] smp/hotplug: Move step CPUHP_AP_SMPCFD_DYING to the correct place Git-Commit-ID: 46febd37f9c758b05cd25feae8512f22584742fe 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: 46febd37f9c758b05cd25feae8512f22584742fe Gitweb: https://git.kernel.org/tip/46febd37f9c758b05cd25feae8512f22584742fe Author: Lai Jiangshan AuthorDate: Tue, 28 Nov 2017 21:19:53 +0800 Committer: Thomas Gleixner CommitDate: Tue, 28 Nov 2017 14:40:23 +0100 smp/hotplug: Move step CPUHP_AP_SMPCFD_DYING to the correct place Commit 31487f8328f2 ("smp/cfd: Convert core to hotplug state machine") accidently put this step on the wrong place. The step should be at the cpuhp_ap_states[] rather than the cpuhp_bp_states[]. grep smpcfd /sys/devices/system/cpu/hotplug/states 40: smpcfd:prepare 129: smpcfd:dying "smpcfd:dying" was missing before. So was the invocation of the function smpcfd_dying_cpu(). Fixes: 31487f8328f2 ("smp/cfd: Convert core to hotplug state machine") Signed-off-by: Lai Jiangshan Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Richard Weinberger Cc: Sebastian Andrzej Siewior Cc: stable@vger.kernel.org Cc: Boris Ostrovsky Link: https://lkml.kernel.org/r/20171128131954.81229-1-jiangshanlai@gmail.com --- kernel/cpu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index 04892a8..7891aec 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1289,11 +1289,6 @@ static struct cpuhp_step cpuhp_bp_states[] = { .teardown.single = NULL, .cant_stop = true, }, - [CPUHP_AP_SMPCFD_DYING] = { - .name = "smpcfd:dying", - .startup.single = NULL, - .teardown.single = smpcfd_dying_cpu, - }, /* * Handled on controll processor until the plugged processor manages * this itself. @@ -1335,6 +1330,11 @@ static struct cpuhp_step cpuhp_ap_states[] = { .startup.single = NULL, .teardown.single = rcutree_dying_cpu, }, + [CPUHP_AP_SMPCFD_DYING] = { + .name = "smpcfd:dying", + .startup.single = NULL, + .teardown.single = smpcfd_dying_cpu, + }, /* Entry state on starting. Interrupts enabled from here on. Transient * state for synchronsization */ [CPUHP_AP_ONLINE] = {