summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:23 +0000
commit38db540ee6930dafa84973fa1c493128ed23d810 (patch)
treee2826f458afdbe0c6d40f534d8bc98dae3db836e /debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch
parentMerging upstream version 4.19.269. (diff)
downloadlinux-38db540ee6930dafa84973fa1c493128ed23d810.tar.xz
linux-38db540ee6930dafa84973fa1c493128ed23d810.zip
Merging debian version 4.19.269-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch')
-rw-r--r--debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch b/debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch
index 137625f8c..998ea0844 100644
--- a/debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch
+++ b/debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch
@@ -1,8 +1,8 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 15 Jan 2016 16:33:34 +0100
-Subject: [PATCH 232/342] net/core: protect users of napi_alloc_cache against
+Subject: [PATCH 232/351] net/core: protect users of napi_alloc_cache against
reentrance
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=2a676f69c03cd2c988d61efa9af4089f653fd83f
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=04e22c7dd016cc14e1c3df677791677ff9260c68
On -RT the code running in BH can not be moved to another CPU so CPU
local variable remain local. However the code can be preempted
@@ -17,7 +17,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 0696d3cb809d..58f78205585c 100644
+index e2561c9c20bd..5e58555405a7 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -332,6 +332,7 @@ struct napi_alloc_cache {