summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-03-26 22:33:40 +0100
committerDavid S. Miller <davem@davemloft.net>2014-03-27 15:28:06 -0400
commit84275593ac8531fc57f8b0ebb8a761bf377b5519 (patch)
tree50de3585a337e00f765a620af0eb649e57feeb80
parent0c295e44dea607be5f4cc2d19ce98afbd77e2619 (diff)
downloadop-kernel-dev-84275593ac8531fc57f8b0ebb8a761bf377b5519.zip
op-kernel-dev-84275593ac8531fc57f8b0ebb8a761bf377b5519.tar.gz
atm: replace del_timer by del_timer_sync
Use del_timer_sync to ensure that the timer is stopped on all CPUs before the driver exists. This change was suggested by Thomas Gleixner. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ declarer name module_exit; identifier ex; @@ module_exit(ex); @@ identifier r.ex; @@ ex(...) { <... - del_timer + del_timer_sync (...) ...> } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/atm/mpc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index b71ff6b..91dc58f 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -1492,7 +1492,7 @@ static void __exit atm_mpoa_cleanup(void)
mpc_proc_clean();
- del_timer(&mpc_timer);
+ del_timer_sync(&mpc_timer);
unregister_netdevice_notifier(&mpoa_notifier);
deregister_atm_ioctl(&atm_ioctl_ops);
OpenPOWER on IntegriCloud