timers, driver/net/ethernet/tile: Initialize the egress timer as pinned

KAGA-KOKO · Ingo Molnar · commit 25df57605edb · 2016-07-07T10:25:14.000+02:00
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>
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ static bool tile_net_lepp_free_comps(struct net_device *dev, bool all)`
`588`	`588`	`static void tile_net_schedule_egress_timer(struct tile_net_cpu *info)`
`589`	`589`	`{`
`590`	`590`	`if (!info->egress_timer_scheduled) {`
`591`		`- mod_timer_pinned(&info->egress_timer, jiffies + 1);`
	`591`	`+ mod_timer(&info->egress_timer, jiffies + 1);`
`592`	`592`	`info->egress_timer_scheduled = true;`
`593`	`593`	`}`
`594`	`594`	`}`
`@@ -1004,7 +1004,7 @@ static void tile_net_register(void *dev_ptr)`
`1004`	`1004`	`BUG();`
`1005`	`1005`
`1006`	`1006`	`/* Initialize the egress timer. */`
`1007`		`- init_timer(&info->egress_timer);`
	`1007`	`+ init_timer_pinned(&info->egress_timer);`
`1008`	`1008`	`info->egress_timer.data = (long)info;`
`1009`	`1009`	`info->egress_timer.function = tile_net_handle_egress_timer;`
`1010`	`1010`