diff options
Diffstat (limited to 'debian/patches-rt/0113-net-Move-lockdep-where-it-belongs.patch')
| -rw-r--r-- | debian/patches-rt/0113-net-Move-lockdep-where-it-belongs.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0113-net-Move-lockdep-where-it-belongs.patch b/debian/patches-rt/0113-net-Move-lockdep-where-it-belongs.patch index b7b6765b1..cdef4386e 100644 --- a/debian/patches-rt/0113-net-Move-lockdep-where-it-belongs.patch +++ b/debian/patches-rt/0113-net-Move-lockdep-where-it-belongs.patch @@ -1,8 +1,8 @@ -From b3ad938c1be05a261ce70af8888271d0b85cd955 Mon Sep 17 00:00:00 2001 +From ed31b5b24e477aa1ebfa4416b3bb950544f3fb57 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 8 Sep 2020 07:32:20 +0200 Subject: [PATCH 113/323] net: Move lockdep where it belongs -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- @@ -10,10 +10,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c -index a069b5476df4..8839cfea108a 100644 +index 016c0b9e01b70..967f72393d559 100644 --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3082,12 +3082,11 @@ void lock_sock_nested(struct sock *sk, int subclass) +@@ -3095,12 +3095,11 @@ void lock_sock_nested(struct sock *sk, int subclass) if (sk->sk_lock.owned) __lock_sock(sk); sk->sk_lock.owned = 1; @@ -27,7 +27,7 @@ index a069b5476df4..8839cfea108a 100644 } EXPORT_SYMBOL(lock_sock_nested); -@@ -3136,12 +3135,11 @@ bool lock_sock_fast(struct sock *sk) +@@ -3149,12 +3148,11 @@ bool lock_sock_fast(struct sock *sk) __lock_sock(sk); sk->sk_lock.owned = 1; @@ -42,5 +42,5 @@ index a069b5476df4..8839cfea108a 100644 } EXPORT_SYMBOL(lock_sock_fast); -- -2.43.0 +2.44.0 |