summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0142-rtmutex-add-sleeping-lock-implementation.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/0142-rtmutex-add-sleeping-lock-implementation.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/0142-rtmutex-add-sleeping-lock-implementation.patch')
-rw-r--r--debian/patches-rt/0142-rtmutex-add-sleeping-lock-implementation.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0142-rtmutex-add-sleeping-lock-implementation.patch b/debian/patches-rt/0142-rtmutex-add-sleeping-lock-implementation.patch
index 0891c9fa3..554cf0dac 100644
--- a/debian/patches-rt/0142-rtmutex-add-sleeping-lock-implementation.patch
+++ b/debian/patches-rt/0142-rtmutex-add-sleeping-lock-implementation.patch
@@ -1,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 12 Oct 2017 17:11:19 +0200
-Subject: [PATCH 142/342] rtmutex: add sleeping lock implementation
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=ba50c47e65ffab81bd256813390bbdf7f4c7ff22
+Subject: [PATCH 142/351] rtmutex: add sleeping lock implementation
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=aeb2fe1f0d08e5e10e6cdccad7ebc570e2412d4f
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
@@ -102,7 +102,7 @@ index a355289b1fa1..138bd1e183e0 100644
* rt_mutex_is_locked - is the mutex locked
* @lock: the mutex to be queried
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 63a97f24d138..e4e206a1e7dd 100644
+index bf13a967491e..1bdb44910261 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -134,6 +134,9 @@ struct task_group;
@@ -133,7 +133,7 @@ index 63a97f24d138..e4e206a1e7dd 100644
/*
* set_special_state() should be used for those states when the blocking task
* can not use the regular condition based wait-loop. In that case we must
-@@ -914,6 +921,7 @@ struct task_struct {
+@@ -918,6 +925,7 @@ struct task_struct {
raw_spinlock_t pi_lock;
struct wake_q_node wake_q;
@@ -1144,7 +1144,7 @@ index 53a8c5d03d28..7c1dd1bd95c7 100644
#ifdef CONFIG_DEBUG_RT_MUTEXES
# include "rtmutex-debug.h"
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index ed79f921a84e..1f450a7649f0 100644
+index b1771f3de84a..d448d4768507 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -401,9 +401,15 @@ static bool set_nr_if_polling(struct task_struct *p)