From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030563AbcGGIlT (ORCPT ); Thu, 7 Jul 2016 04:41:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38912 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030309AbcGGIlN (ORCPT ); Thu, 7 Jul 2016 04:41:13 -0400 Date: Thu, 7 Jul 2016 01:40:18 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: linux-kernel@vger.kernel.org, lenb@kernel.org, riel@redhat.com, josh@joshtriplett.org, mingo@kernel.org, hpa@zytor.com, fweisbec@gmail.com, paulmck@linux.vnet.ibm.com, torvalds@linux-foundation.org, peterz@infradead.org, clm@fb.com, tglx@linutronix.de, arjan@infradead.org, linux@sciencehorizons.net, edumazet@google.com Reply-To: linux@sciencehorizons.net, edumazet@google.com, arjan@infradead.org, tglx@linutronix.de, clm@fb.com, peterz@infradead.org, fweisbec@gmail.com, torvalds@linux-foundation.org, paulmck@linux.vnet.ibm.com, hpa@zytor.com, josh@joshtriplett.org, mingo@kernel.org, lenb@kernel.org, riel@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20160704094341.133837204@linutronix.de> References: <20160704094341.133837204@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers, x86/apic/uv: Initialize the UV heartbeat timer as pinned Git-Commit-ID: 920a4a70c55058a9997f2e35bf41503acf87c301 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: 920a4a70c55058a9997f2e35bf41503acf87c301 Gitweb: http://git.kernel.org/tip/920a4a70c55058a9997f2e35bf41503acf87c301 Author: Thomas Gleixner AuthorDate: Mon, 4 Jul 2016 09:50:16 +0000 Committer: Ingo Molnar CommitDate: Thu, 7 Jul 2016 10:25:14 +0200 timers, x86/apic/uv: Initialize the UV heartbeat timer as pinned Pinned timers must carry the pinned attribute in the timer structure itself, so convert the code to the new API. No functional change. Signed-off-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker Cc: Arjan van de Ven Cc: Chris Mason Cc: Eric Dumazet Cc: George Spelvin Cc: Josh Triplett Cc: Len Brown Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Rik van Riel Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160704094341.133837204@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/x2apic_uv_x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 2900315..7a50519 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -919,7 +919,7 @@ static void uv_heartbeat(unsigned long ignored) uv_set_scir_bits(bits); /* enable next timer period */ - mod_timer_pinned(timer, jiffies + SCIR_CPU_HB_INTERVAL); + mod_timer(timer, jiffies + SCIR_CPU_HB_INTERVAL); } static void uv_heartbeat_enable(int cpu) @@ -928,7 +928,7 @@ static void uv_heartbeat_enable(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_timer(timer, uv_heartbeat, cpu); + setup_pinned_timer(timer, uv_heartbeat, cpu); timer->expires = jiffies + SCIR_CPU_HB_INTERVAL; add_timer_on(timer, cpu); uv_cpu_scir_info(cpu)->enabled = 1;