From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S943380AbdEZImH (ORCPT ); Fri, 26 May 2017 04:42:07 -0400 Received: from terminus.zytor.com ([65.50.211.136]:33179 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934529AbdEZImD (ORCPT ); Fri, 26 May 2017 04:42:03 -0400 Date: Fri, 26 May 2017 01:39:29 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: rostedt@goodmis.org, mingo@kernel.org, tglx@linutronix.de, heiko.carstens@de.ibm.com, bigeasy@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, dahi@linux.vnet.ibm.com, schwidefsky@de.ibm.com, peterz@infradead.org, paulmck@linux.vnet.ibm.com Reply-To: schwidefsky@de.ibm.com, dahi@linux.vnet.ibm.com, peterz@infradead.org, paulmck@linux.vnet.ibm.com, rostedt@goodmis.org, mingo@kernel.org, bigeasy@linutronix.de, heiko.carstens@de.ibm.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <20170524081548.250203087@linutronix.de> References: <20170524081548.250203087@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] s390/kernel: Use stop_machine_cpuslocked() Git-Commit-ID: 2337e879e8805a630b418f3e73a98084d4724b83 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: 2337e879e8805a630b418f3e73a98084d4724b83 Gitweb: http://git.kernel.org/tip/2337e879e8805a630b418f3e73a98084d4724b83 Author: Sebastian Andrzej Siewior AuthorDate: Wed, 24 May 2017 10:15:26 +0200 Committer: Thomas Gleixner CommitDate: Fri, 26 May 2017 10:10:41 +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. Convert *_online_cpus() to the new interfaces while at it. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Acked-by: Heiko Carstens Cc: Paul E. McKenney Cc: linux-s390@vger.kernel.org Cc: Peter Zijlstra Cc: Steven Rostedt Cc: David Hildenbrand Cc: Martin Schwidefsky Link: http://lkml.kernel.org/r/20170524081548.250203087@linutronix.de --- arch/s390/kernel/time.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index c3a52f9..192efdf 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -636,10 +636,10 @@ static void stp_work_fn(struct work_struct *work) goto out_unlock; memset(&stp_sync, 0, sizeof(stp_sync)); - get_online_cpus(); + cpus_read_lock(); atomic_set(&stp_sync.cpus, num_online_cpus() - 1); - stop_machine(stp_sync_clock, &stp_sync, cpu_online_mask); - put_online_cpus(); + stop_machine_cpuslocked(stp_sync_clock, &stp_sync, cpu_online_mask); + cpus_read_unlock(); if (!check_sync_clock()) /*