diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-03-26 22:33:44 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-27 15:28:06 -0400 |
commit | 02f2d5a066a1bc85db3ffe3841282ad2071e2cfe (patch) | |
tree | 3c3541be5bf31b69aa4cec7334a31928c5eaceb5 /net/hsr | |
parent | 84275593ac8531fc57f8b0ebb8a761bf377b5519 (diff) | |
download | op-kernel-dev-02f2d5a066a1bc85db3ffe3841282ad2071e2cfe.zip op-kernel-dev-02f2d5a066a1bc85db3ffe3841282ad2071e2cfe.tar.gz |
hsr: 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>
Diffstat (limited to 'net/hsr')
-rw-r--r-- | net/hsr/hsr_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c index 10010c5..3fee521 100644 --- a/net/hsr/hsr_main.c +++ b/net/hsr/hsr_main.c @@ -459,7 +459,7 @@ static int __init hsr_init(void) static void __exit hsr_exit(void) { unregister_netdevice_notifier(&hsr_nb); - del_timer(&prune_timer); + del_timer_sync(&prune_timer); hsr_netlink_exit(); dev_remove_pack(&hsr_pt); } |