From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936646AbdJQPrF (ORCPT ); Tue, 17 Oct 2017 11:47:05 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36573 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933194AbdJQPrC (ORCPT ); Tue, 17 Oct 2017 11:47:02 -0400 Date: Tue, 17 Oct 2017 08:44:27 -0700 From: tip-bot for Kees Cook Message-ID: Cc: rja@hpe.com, mingo@kernel.org, keescook@chromium.org, linux-kernel@vger.kernel.org, sivanich@hpe.com, hpa@zytor.com, tglx@linutronix.de, mike.travis@hpe.com Reply-To: rja@hpe.com, mingo@kernel.org, keescook@chromium.org, linux-kernel@vger.kernel.org, sivanich@hpe.com, hpa@zytor.com, tglx@linutronix.de, mike.travis@hpe.com In-Reply-To: <20171016232231.GA100493@beast> References: <20171016232231.GA100493@beast> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/UV: Convert timers to use timer_setup() Git-Commit-ID: 376f3bcebdc999cc737d9052109cc33b573b3a8b 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: 376f3bcebdc999cc737d9052109cc33b573b3a8b Gitweb: https://git.kernel.org/tip/376f3bcebdc999cc737d9052109cc33b573b3a8b Author: Kees Cook AuthorDate: Mon, 16 Oct 2017 16:22:31 -0700 Committer: Thomas Gleixner CommitDate: Tue, 17 Oct 2017 17:40:06 +0200 x86/platform/UV: Convert timers to use timer_setup() In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Signed-off-by: Kees Cook Signed-off-by: Thomas Gleixner Cc: Dimitri Sivanich Cc: Russ Anderson Cc: Mike Travis Link: https://lkml.kernel.org/r/20171016232231.GA100493@beast --- arch/x86/kernel/apic/x2apic_uv_x.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 0d57bb9..c0b6948 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -920,9 +920,8 @@ static __init void uv_rtc_init(void) /* * percpu heartbeat timer */ -static void uv_heartbeat(unsigned long ignored) +static void uv_heartbeat(struct timer_list *timer) { - struct timer_list *timer = &uv_scir_info->timer; unsigned char bits = uv_scir_info->state; /* Flip heartbeat bit: */ @@ -947,7 +946,7 @@ static int uv_heartbeat_enable(unsigned int cpu) struct timer_list *timer = &uv_cpu_scir_info(cpu)->timer; uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY); - setup_pinned_timer(timer, uv_heartbeat, cpu); + timer_setup(timer, uv_heartbeat, TIMER_PINNED); timer->expires = jiffies + SCIR_CPU_HB_INTERVAL; add_timer_on(timer, cpu); uv_cpu_scir_info(cpu)->enabled = 1;