summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0156-locking-rtmutex-Remove-cruft.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0156-locking-rtmutex-Remove-cruft.patch')
-rw-r--r--debian/patches-rt/0156-locking-rtmutex-Remove-cruft.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/0156-locking-rtmutex-Remove-cruft.patch b/debian/patches-rt/0156-locking-rtmutex-Remove-cruft.patch
index a39953384..f746db8dc 100644
--- a/debian/patches-rt/0156-locking-rtmutex-Remove-cruft.patch
+++ b/debian/patches-rt/0156-locking-rtmutex-Remove-cruft.patch
@@ -1,8 +1,8 @@
-From 46072fa492b76df5aaf47fea23d280f72d7100a8 Mon Sep 17 00:00:00 2001
+From 8d35ddab18aec09ea7cba348a32913c9c9463342 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 29 Sep 2020 15:21:17 +0200
Subject: [PATCH 156/323] locking/rtmutex: Remove cruft
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
Most of this is around since the very beginning. I'm not sure if this
was used while the rtmutex-deadlock-tester was around but today it seems
@@ -26,7 +26,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
4 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
-index 6fd615a0eea9..16f974a22f51 100644
+index 6fd615a0eea94..16f974a22f516 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -32,10 +32,7 @@ struct rt_mutex {
@@ -51,7 +51,7 @@ index 6fd615a0eea9..16f974a22f51 100644
# define rt_mutex_init(mutex) \
do { \
diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c
-index 36e69100e8e0..7e411b946d4c 100644
+index 36e69100e8e06..7e411b946d4c3 100644
--- a/kernel/locking/rtmutex-debug.c
+++ b/kernel/locking/rtmutex-debug.c
@@ -42,12 +42,7 @@ static void printk_task(struct task_struct *p)
@@ -69,7 +69,7 @@ index 36e69100e8e0..7e411b946d4c 100644
if (print_owner && rt_mutex_owner(lock)) {
printk(".. ->owner: %p\n", lock->owner);
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
-index f00dd928fc71..4792fc7abe7d 100644
+index f00dd928fc711..4792fc7abe7dd 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1655,9 +1655,6 @@ void __sched rt_mutex_futex_unlock(struct rt_mutex *lock)
@@ -83,7 +83,7 @@ index f00dd928fc71..4792fc7abe7d 100644
EXPORT_SYMBOL_GPL(rt_mutex_destroy);
diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
-index ca6fb489007b..e6913103d7ff 100644
+index ca6fb489007b6..e6913103d7ff7 100644
--- a/kernel/locking/rtmutex_common.h
+++ b/kernel/locking/rtmutex_common.h
@@ -30,7 +30,6 @@ struct rt_mutex_waiter {
@@ -95,5 +95,5 @@ index ca6fb489007b..e6913103d7ff 100644
struct rt_mutex *deadlock_lock;
#endif
--
-2.43.0
+2.44.0