From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752176AbdLFW3E (ORCPT ); Wed, 6 Dec 2017 17:29:04 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:46619 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751598AbdLFW3C (ORCPT ); Wed, 6 Dec 2017 17:29:02 -0500 X-Google-Smtp-Source: AGs4zMYEXjYhHhZpaxL0liGmBurLTL7Bezz9wadkOgGCoeha37l1HWXiEXCvBX3sARTCYOaWQMf6FA== Date: Wed, 6 Dec 2017 23:28:54 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Peter Zijlstra , Andrew Morton Subject: [GIT PULL] CPU hotplug fix Message-ID: <20171206222854.xzxi2pvh7tcdho3n@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, Please pull the latest smp-urgent-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git smp-urgent-for-linus # HEAD: 46febd37f9c758b05cd25feae8512f22584742fe smp/hotplug: Move step CPUHP_AP_SMPCFD_DYING to the correct place A single fix moving the smp-call queue flush step to the intended point in the state machine. Thanks, Ingo ------------------> Lai Jiangshan (1): smp/hotplug: Move step CPUHP_AP_SMPCFD_DYING to the correct place kernel/cpu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index 04892a82f6ac..7891aecc6aec 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] = {