Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 00a074dbfe9bf169c2b81498e6ae265199745b22..45f447c7ed3ef5708a9f1d96003bd433a69fe799 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2488,12 +2488,11 @@ void lock_sock_nested(struct sock *sk, int subclass)
        if (sk->sk_lock.owned)
                __lock_sock(sk);
        sk->sk_lock.owned = 1;
-       spin_unlock(&sk->sk_lock.slock);
+       spin_unlock_bh(&sk->sk_lock.slock);
        /*
         * The sk_lock has mutex_lock() semantics here:
         */
        mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_);
-       local_bh_enable();
 }
 EXPORT_SYMBOL(lock_sock_nested);