diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-01 11:47:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-01 11:47:44 -0400 |
| commit | bf61c8840efe60fd8f91446860b63338fb424158 (patch) | |
| tree | 7a71832407a4f0d6346db773343f4c3ae2257b19 /net/tipc/handler.c | |
| parent | 5846115b30f3a881e542c8bfde59a699c1c13740 (diff) | |
| parent | 0c6a61657da78098472fd0eb71cc01f2387fa1bb (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.10 merge window.
Diffstat (limited to 'net/tipc/handler.c')
| -rw-r--r-- | net/tipc/handler.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c index 111ff8300ae5..b36f0fcd9bdf 100644 --- a/net/tipc/handler.c +++ b/net/tipc/handler.c | |||
| @@ -116,7 +116,6 @@ void tipc_handler_stop(void) | |||
| 116 | return; | 116 | return; |
| 117 | 117 | ||
| 118 | handler_enabled = 0; | 118 | handler_enabled = 0; |
| 119 | tasklet_disable(&tipc_tasklet); | ||
| 120 | tasklet_kill(&tipc_tasklet); | 119 | tasklet_kill(&tipc_tasklet); |
| 121 | 120 | ||
| 122 | spin_lock_bh(&qitem_lock); | 121 | spin_lock_bh(&qitem_lock); |