timers, driver/net/ethernet/tile: Initialize the egress timer as pinned
authorThomas Gleixner <tglx@linutronix.de>
Mon, 4 Jul 2016 09:50:19 +0000 (09:50 +0000)
committerIngo Molnar <mingo@kernel.org>
Thu, 7 Jul 2016 08:25:14 +0000 (10:25 +0200)
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 <tglx@linutronix.de>
Reviewed-by: Frederic 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.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/net/ethernet/tile/tilepro.c

index 922a443e3415bf0656ff7c989412958701d79f96..4ef605a9024752d85596c4b1e120148b70a7f561 100644 (file)
@@ -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;