From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944738AbdDTL1I (ORCPT ); Thu, 20 Apr 2017 07:27:08 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55821 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S944521AbdDTL1D (ORCPT ); Thu, 20 Apr 2017 07:27:03 -0400 Date: Thu, 20 Apr 2017 04:24:27 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, dahi@linux.vnet.ibm.com, schwidefsky@de.ibm.com, bigeasy@linutronix.de, rostedt@goodmis.org, linux-kernel@vger.kernel.org, hpa@zytor.com, heiko.carstens@de.ibm.com, tglx@linutronix.de Reply-To: mingo@kernel.org, peterz@infradead.org, dahi@linux.vnet.ibm.com, schwidefsky@de.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, tglx@linutronix.de, heiko.carstens@de.ibm.com, bigeasy@linutronix.de In-Reply-To: <20170418170553.363283884@linutronix.de> References: <20170418170553.363283884@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] s390/kernel: Use stop_machine_cpuslocked() Git-Commit-ID: 35cc1ac5c24cb497b3b15a9383ff098e4a8bf03c 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: 35cc1ac5c24cb497b3b15a9383ff098e4a8bf03c Gitweb: http://git.kernel.org/tip/35cc1ac5c24cb497b3b15a9383ff098e4a8bf03c Author: Sebastian Andrzej Siewior AuthorDate: Tue, 18 Apr 2017 19:04:54 +0200 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 13:08:54 +0200 s390/kernel: Use stop_machine_cpuslocked() stp_work_fn() holds get_online_cpus() while invoking stop_machine(). stop_machine() invokes get_online_cpus() as well. This is correct, but prevents the conversion of the hotplug locking to a percpu rwsem. Use stop_machine_cpuslocked() to avoid the nested call. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Cc: linux-s390@vger.kernel.org Cc: Peter Zijlstra Cc: Heiko Carstens Cc: Steven Rostedt Cc: David Hildenbrand Cc: Martin Schwidefsky Link: http://lkml.kernel.org/r/20170418170553.363283884@linutronix.de --- arch/s390/kernel/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index c31da46..3aa8acb 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -636,7 +636,7 @@ static void stp_work_fn(struct work_struct *work) memset(&stp_sync, 0, sizeof(stp_sync)); get_online_cpus(); atomic_set(&stp_sync.cpus, num_online_cpus() - 1); - stop_machine(stp_sync_clock, &stp_sync, cpu_online_mask); + stop_machine_cpuslocked(stp_sync_clock, &stp_sync, cpu_online_mask); put_online_cpus(); if (!check_sync_clock())