summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/srcu-replace-local_irqsave-with-a-locallock.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/srcu-replace-local_irqsave-with-a-locallock.patch')
-rw-r--r--debian/patches-rt/srcu-replace-local_irqsave-with-a-locallock.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/srcu-replace-local_irqsave-with-a-locallock.patch b/debian/patches-rt/srcu-replace-local_irqsave-with-a-locallock.patch
index 10f82a27a..b7ed5ae77 100644
--- a/debian/patches-rt/srcu-replace-local_irqsave-with-a-locallock.patch
+++ b/debian/patches-rt/srcu-replace-local_irqsave-with-a-locallock.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 12 Oct 2017 18:37:12 +0200
Subject: [PATCH] srcu: replace local_irqsave() with a locallock
-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
There are two instances which disable interrupts in order to become a
stable this_cpu_ptr() pointer. The restore part is coupled with
@@ -16,7 +16,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
-@@ -38,6 +38,7 @@
+@@ -25,6 +25,7 @@
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/srcu.h>
@@ -24,7 +24,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
#include "rcu.h"
#include "rcu_segcblist.h"
-@@ -752,6 +753,7 @@ static void srcu_flip(struct srcu_struct
+@@ -735,6 +736,7 @@ static void srcu_flip(struct srcu_struct
smp_mb(); /* D */ /* Pairs with C. */
}
@@ -32,7 +32,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* If SRCU is likely idle, return true, otherwise return false.
*
-@@ -781,13 +783,13 @@ static bool srcu_might_be_idle(struct sr
+@@ -764,13 +766,13 @@ static bool srcu_might_be_idle(struct sr
unsigned long t;
/* If the local srcu_data structure has callbacks, not idle. */
@@ -49,7 +49,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* No local callbacks, so probabalistically probe global state.
-@@ -867,7 +869,7 @@ void __call_srcu(struct srcu_struct *ssp
+@@ -850,7 +852,7 @@ void __call_srcu(struct srcu_struct *ssp
}
rhp->func = func;
idx = srcu_read_lock(ssp);
@@ -58,7 +58,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
sdp = this_cpu_ptr(ssp->sda);
spin_lock_rcu_node(sdp);
rcu_segcblist_enqueue(&sdp->srcu_cblist, rhp, false);
-@@ -883,7 +885,8 @@ void __call_srcu(struct srcu_struct *ssp
+@@ -866,7 +868,8 @@ void __call_srcu(struct srcu_struct *ssp
sdp->srcu_gp_seq_needed_exp = s;
needexp = true;
}