Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[mirror_ubuntu-artful-kernel.git] / net / rose / rose_timer.c

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index 50ae0371dab872e1ee0b51d11362d8f7de532f8b..bc5469d6d9cb5cdf6e7995e3ee605f97d2dd2616 100644 (file)
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -23,7 +23,6 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
-#include <asm/system.h>
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -138,6 +137,7 @@ static void rose_heartbeat_expiry(unsigned long param)
                   is accepted() it isn't 'dead' so doesn't get removed. */
                if (sock_flag(sk, SOCK_DESTROY) ||
                    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
+                       bh_unlock_sock(sk);
                        rose_destroy_socket(sk);
                        return;
                }