From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030578AbcGGIlo (ORCPT ); Thu, 7 Jul 2016 04:41:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38960 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030282AbcGGIlm (ORCPT ); Thu, 7 Jul 2016 04:41:42 -0400 Date: Thu, 7 Jul 2016 01:40:46 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: torvalds@linux-foundation.org, josh@joshtriplett.org, hpa@zytor.com, fweisbec@gmail.com, peterz@infradead.org, linux@sciencehorizons.net, edumazet@google.com, paulmck@linux.vnet.ibm.com, lenb@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, arjan@infradead.org, clm@fb.com, mingo@kernel.org, riel@redhat.com Reply-To: mingo@kernel.org, riel@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, arjan@infradead.org, clm@fb.com, linux@sciencehorizons.net, edumazet@google.com, paulmck@linux.vnet.ibm.com, lenb@kernel.org, josh@joshtriplett.org, torvalds@linux-foundation.org, fweisbec@gmail.com, hpa@zytor.com, peterz@infradead.org In-Reply-To: <20160704094341.215783439@linutronix.de> References: <20160704094341.215783439@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers, x86/mce: Initialize MCE restart timer as pinned Git-Commit-ID: f9c287ba3861714a1959accf14e815c44291bec4 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: f9c287ba3861714a1959accf14e815c44291bec4 Gitweb: http://git.kernel.org/tip/f9c287ba3861714a1959accf14e815c44291bec4 Author: Thomas Gleixner AuthorDate: Mon, 4 Jul 2016 09:50:17 +0000 Committer: Ingo Molnar CommitDate: Thu, 7 Jul 2016 10:25:14 +0200 timers, x86/mce: Initialize MCE restart 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.215783439@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/mcheck/mce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 92e5e37..b80a636 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1309,7 +1309,7 @@ static void __restart_timer(struct timer_list *t, unsigned long interval) if (timer_pending(t)) { if (time_before(when, t->expires)) - mod_timer_pinned(t, when); + mod_timer(t, when); } else { t->expires = round_jiffies(when); add_timer_on(t, smp_processor_id()); @@ -1735,7 +1735,7 @@ static void __mcheck_cpu_init_timer(void) struct timer_list *t = this_cpu_ptr(&mce_timer); unsigned int cpu = smp_processor_id(); - setup_timer(t, mce_timer_fn, cpu); + setup_pinned_timer(t, mce_timer_fn, cpu); mce_start_timer(cpu, t); }