Skip to content

Commit 25df576

Browse files
KAGA-KOKOIngo Molnar
authored andcommitted
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 <[email protected]> Reviewed-by: Frederic Weisbecker <[email protected]> Cc: Arjan van de Ven <[email protected]> Cc: Chris Mason <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: George Spelvin <[email protected]> Cc: Josh Triplett <[email protected]> Cc: Len Brown <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rik van Riel <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 7bc54b6 commit 25df576

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/tile/tilepro.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ static bool tile_net_lepp_free_comps(struct net_device *dev, bool all)
588588
static void tile_net_schedule_egress_timer(struct tile_net_cpu *info)
589589
{
590590
if (!info->egress_timer_scheduled) {
591-
mod_timer_pinned(&info->egress_timer, jiffies + 1);
591+
mod_timer(&info->egress_timer, jiffies + 1);
592592
info->egress_timer_scheduled = true;
593593
}
594594
}
@@ -1004,7 +1004,7 @@ static void tile_net_register(void *dev_ptr)
10041004
BUG();
10051005

10061006
/* Initialize the egress timer. */
1007-
init_timer(&info->egress_timer);
1007+
init_timer_pinned(&info->egress_timer);
10081008
info->egress_timer.data = (long)info;
10091009
info->egress_timer.function = tile_net_handle_egress_timer;
10101010

0 commit comments

Comments
 (0)