diff options
Diffstat (limited to 'features/rt/net-Move-lockdep-where-it-belongs.patch')
| -rw-r--r-- | features/rt/net-Move-lockdep-where-it-belongs.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/features/rt/net-Move-lockdep-where-it-belongs.patch b/features/rt/net-Move-lockdep-where-it-belongs.patch new file mode 100644 index 00000000..d6d1ff0d --- /dev/null +++ b/features/rt/net-Move-lockdep-where-it-belongs.patch @@ -0,0 +1,46 @@ +From abf7b145f704064b5de40759c313fe711a89234f Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner <tglx@linutronix.de> +Date: Tue, 8 Sep 2020 07:32:20 +0200 +Subject: [PATCH 038/191] net: Move lockdep where it belongs + +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +--- + net/core/sock.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/net/core/sock.c b/net/core/sock.c +index 0ed98f20448a..f1d1cee0dddd 100644 +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -3064,12 +3064,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); + +@@ -3118,13 +3117,12 @@ bool lock_sock_fast(struct sock *sk) __acquires(&sk->sk_lock.slock) + + __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, 0, 0, _RET_IP_); + __acquire(&sk->sk_lock.slock); +- local_bh_enable(); + return true; + } + EXPORT_SYMBOL(lock_sock_fast); +-- +2.19.1 + |