Commit 25df5760 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

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: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Chris Mason <clm@fb.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: George Spelvin <linux@sciencehorizons.net>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160704094341.376394205@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7bc54b65
...@@ -588,7 +588,7 @@ static bool tile_net_lepp_free_comps(struct net_device *dev, bool all) ...@@ -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) static void tile_net_schedule_egress_timer(struct tile_net_cpu *info)
{ {
if (!info->egress_timer_scheduled) { 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; info->egress_timer_scheduled = true;
} }
} }
...@@ -1004,7 +1004,7 @@ static void tile_net_register(void *dev_ptr) ...@@ -1004,7 +1004,7 @@ static void tile_net_register(void *dev_ptr)
BUG(); BUG();
/* Initialize the egress timer. */ /* Initialize the egress timer. */
init_timer(&info->egress_timer); init_timer_pinned(&info->egress_timer);
info->egress_timer.data = (long)info; info->egress_timer.data = (long)info;
info->egress_timer.function = tile_net_handle_egress_timer; info->egress_timer.function = tile_net_handle_egress_timer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment