summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0121-softirq-Split-softirq-locks.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/0121-softirq-Split-softirq-locks.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/0121-softirq-Split-softirq-locks.patch')
-rw-r--r--debian/patches-rt/0121-softirq-Split-softirq-locks.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0121-softirq-Split-softirq-locks.patch b/debian/patches-rt/0121-softirq-Split-softirq-locks.patch
index 1744900fe..8940a458a 100644
--- a/debian/patches-rt/0121-softirq-Split-softirq-locks.patch
+++ b/debian/patches-rt/0121-softirq-Split-softirq-locks.patch
@@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 4 Oct 2012 14:20:47 +0100
-Subject: [PATCH 121/342] softirq: Split softirq locks
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=8b2084eea88470c1ab4999158ba663263ffe62cc
+Subject: [PATCH 121/351] softirq: Split softirq locks
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=6b4331c68b1951abae16632083ed35fd2f6d7789
The 3.x RT series removed the split softirq implementation in favour
of pushing softirq processing into the context of the thread which
@@ -177,10 +177,10 @@ index 9984f2b75b73..27c3176d88d2 100644
#define in_task() (!(preempt_count() & \
(NMI_MASK | HARDIRQ_MASK | SOFTIRQ_OFFSET)))
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 1b2884889dd0..63a97f24d138 100644
+index 44a5e80481bb..bf13a967491e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -1200,6 +1200,8 @@ struct task_struct {
+@@ -1204,6 +1204,8 @@ struct task_struct {
#endif
#ifdef CONFIG_PREEMPT_RT_BASE
struct rcu_head put_rcu;
@@ -189,7 +189,7 @@ index 1b2884889dd0..63a97f24d138 100644
#endif
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
unsigned long task_state_change;
-@@ -1397,6 +1399,7 @@ extern struct pid *cad_pid;
+@@ -1401,6 +1403,7 @@ extern struct pid *cad_pid;
/*
* Per process flags
*/