summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/net-another-local-irq-disable-alloc-atomic-headache.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/net-another-local-irq-disable-alloc-atomic-headache.patch')
-rw-r--r--debian/patches-rt/net-another-local-irq-disable-alloc-atomic-headache.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/net-another-local-irq-disable-alloc-atomic-headache.patch b/debian/patches-rt/net-another-local-irq-disable-alloc-atomic-headache.patch
index b39f1589f..6a5501521 100644
--- a/debian/patches-rt/net-another-local-irq-disable-alloc-atomic-headache.patch
+++ b/debian/patches-rt/net-another-local-irq-disable-alloc-atomic-headache.patch
@@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 26 Sep 2012 16:21:08 +0200
Subject: net: Another local_irq_disable/kmalloc headache
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.0/older/patches-5.0.10-rt7.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2-rt1.tar.xz
Replace it by a local lock. Though that's pretty inefficient :(
@@ -12,7 +12,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -63,6 +63,7 @@
+@@ -59,6 +59,7 @@
#include <linux/errqueue.h>
#include <linux/prefetch.h>
#include <linux/if_vlan.h>
@@ -20,7 +20,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
#include <net/protocol.h>
#include <net/dst.h>
-@@ -333,6 +334,7 @@ struct napi_alloc_cache {
+@@ -364,6 +365,7 @@ struct napi_alloc_cache {
static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);
static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);
@@ -28,7 +28,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
{
-@@ -340,10 +342,10 @@ static void *__netdev_alloc_frag(unsigne
+@@ -371,10 +373,10 @@ static void *__netdev_alloc_frag(unsigne
unsigned long flags;
void *data;
@@ -41,7 +41,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
return data;
}
-@@ -415,13 +417,13 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -446,13 +448,13 @@ struct sk_buff *__netdev_alloc_skb(struc
if (sk_memalloc_socks())
gfp_mask |= __GFP_MEMALLOC;