From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756907AbcGGImV (ORCPT ); Thu, 7 Jul 2016 04:42:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39048 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752207AbcGGImS (ORCPT ); Thu, 7 Jul 2016 04:42:18 -0400 Date: Thu, 7 Jul 2016 01:41:39 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: lenb@kernel.org, linux-kernel@vger.kernel.org, edumazet@google.com, mingo@kernel.org, linux@sciencehorizons.net, hpa@zytor.com, torvalds@linux-foundation.org, tglx@linutronix.de, riel@redhat.com, fweisbec@gmail.com, paulmck@linux.vnet.ibm.com, peterz@infradead.org, josh@joshtriplett.org, clm@fb.com, arjan@infradead.org Reply-To: lenb@kernel.org, mingo@kernel.org, linux@sciencehorizons.net, linux-kernel@vger.kernel.org, edumazet@google.com, riel@redhat.com, paulmck@linux.vnet.ibm.com, fweisbec@gmail.com, torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, clm@fb.com, josh@joshtriplett.org, arjan@infradead.org, peterz@infradead.org In-Reply-To: <20160704094341.376394205@linutronix.de> References: <20160704094341.376394205@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers, driver/net/ethernet/tile: Initialize the egress timer as pinned Git-Commit-ID: 25df57605edbe92b6f4215226bd40e1a465ef6b4 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: 25df57605edbe92b6f4215226bd40e1a465ef6b4 Gitweb: http://git.kernel.org/tip/25df57605edbe92b6f4215226bd40e1a465ef6b4 Author: Thomas Gleixner AuthorDate: Mon, 4 Jul 2016 09:50:19 +0000 Committer: Ingo Molnar CommitDate: Thu, 7 Jul 2016 10:25:14 +0200 timers, driver/net/ethernet/tile: Initialize the egress 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.376394205@linutronix.de Signed-off-by: Ingo Molnar --- drivers/net/ethernet/tile/tilepro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index 922a443..4ef605a 100644 --- a/drivers/net/ethernet/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c @@ -588,7 +588,7 @@ static bool tile_net_lepp_free_comps(struct net_device *dev, bool all) static void tile_net_schedule_egress_timer(struct tile_net_cpu *info) { if (!info->egress_timer_scheduled) { - mod_timer_pinned(&info->egress_timer, jiffies + 1); + mod_timer(&info->egress_timer, jiffies + 1); info->egress_timer_scheduled = true; } } @@ -1004,7 +1004,7 @@ static void tile_net_register(void *dev_ptr) BUG(); /* Initialize the egress timer. */ - init_timer(&info->egress_timer); + init_timer_pinned(&info->egress_timer); info->egress_timer.data = (long)info; info->egress_timer.function = tile_net_handle_egress_timer;