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 04:17:46 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:17:58 +0000
commitbefd7d6833514b1396e87fdff689ce8be3ad4ab1 (patch)
tree279aa396beb362a9f4c449a1fb0ed5062c2444d3 /debian/patches-rt/0232-net-core-protect-users-of-napi_alloc_cache-against-r.patch
parentMerging upstream version 4.19.289. (diff)
downloadlinux-befd7d6833514b1396e87fdff689ce8be3ad4ab1.tar.xz
linux-befd7d6833514b1396e87fdff689ce8be3ad4ab1.zip
Merging debian version 4.19.289-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.patch4
1 files changed, 2 insertions, 2 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 12fc98e78..91d964093 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
@@ -2,7 +2,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 15 Jan 2016 16:33:34 +0100
Subject: [PATCH 232/353] 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=ad635b4a64132b99a1724f778fb29edbed85ced0
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=dc5ea742864b9a2748639c80614d47e6e6484b34
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 083ed8a6aad5..6e0438bc8011 100644
+index c7d1f0c81c97..d3706fa458a5 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -332,6 +332,7 @@ struct napi_alloc_cache {