diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:46:06 +0000 |
| commit | 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch) | |
| tree | 968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0157-locking-rtmutex-Remove-output-from-deadlock-detector.patch | |
| parent | Merging upstream version 5.10.216. (diff) | |
| download | linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip | |
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0157-locking-rtmutex-Remove-output-from-deadlock-detector.patch')
| -rw-r--r-- | debian/patches-rt/0157-locking-rtmutex-Remove-output-from-deadlock-detector.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches-rt/0157-locking-rtmutex-Remove-output-from-deadlock-detector.patch b/debian/patches-rt/0157-locking-rtmutex-Remove-output-from-deadlock-detector.patch index 6f0878b80..95321be38 100644 --- a/debian/patches-rt/0157-locking-rtmutex-Remove-output-from-deadlock-detector.patch +++ b/debian/patches-rt/0157-locking-rtmutex-Remove-output-from-deadlock-detector.patch @@ -1,9 +1,9 @@ -From e9b488ea6cb82e796f8d331b037cb7de76d15657 Mon Sep 17 00:00:00 2001 +From 8f5236d794db1770040f01501f471b8e2e842e4b Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue, 29 Sep 2020 16:05:11 +0200 Subject: [PATCH 157/323] locking/rtmutex: Remove output from deadlock detector. -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 In commit f5694788ad8da ("rt_mutex: Add lockdep annotations") @@ -34,7 +34,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 6 files changed, 135 deletions(-) diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h -index 16f974a22f51..88a0ba806066 100644 +index 16f974a22f516..88a0ba806066b 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h @@ -31,9 +31,6 @@ struct rt_mutex { @@ -73,7 +73,7 @@ index 16f974a22f51..88a0ba806066 100644 #define DEFINE_RT_MUTEX(mutexname) \ diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c -index 7e411b946d4c..fb150100335f 100644 +index 7e411b946d4c3..fb150100335fc 100644 --- a/kernel/locking/rtmutex-debug.c +++ b/kernel/locking/rtmutex-debug.c @@ -32,105 +32,12 @@ @@ -207,7 +207,7 @@ index 7e411b946d4c..fb150100335f 100644 } - diff --git a/kernel/locking/rtmutex-debug.h b/kernel/locking/rtmutex-debug.h -index fc549713bba3..659e93e256c6 100644 +index fc549713bba3f..659e93e256c67 100644 --- a/kernel/locking/rtmutex-debug.h +++ b/kernel/locking/rtmutex-debug.h @@ -18,20 +18,9 @@ extern void debug_rt_mutex_unlock(struct rt_mutex *lock); @@ -232,7 +232,7 @@ index fc549713bba3..659e93e256c6 100644 - debug_rt_mutex_print_deadlock(w); -} diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c -index 4792fc7abe7d..9aa4d545020a 100644 +index 4792fc7abe7dd..9aa4d545020af 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -597,7 +597,6 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, @@ -273,7 +273,7 @@ index 4792fc7abe7d..9aa4d545020a 100644 } diff --git a/kernel/locking/rtmutex.h b/kernel/locking/rtmutex.h -index 732f96abf462..338ccd29119a 100644 +index 732f96abf4623..338ccd29119a1 100644 --- a/kernel/locking/rtmutex.h +++ b/kernel/locking/rtmutex.h @@ -19,15 +19,8 @@ @@ -293,7 +293,7 @@ index 732f96abf462..338ccd29119a 100644 enum rtmutex_chainwalk walk) { diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h -index e6913103d7ff..b1455dc2366f 100644 +index e6913103d7ff7..b1455dc2366fb 100644 --- a/kernel/locking/rtmutex_common.h +++ b/kernel/locking/rtmutex_common.h @@ -29,10 +29,6 @@ struct rt_mutex_waiter { @@ -308,5 +308,5 @@ index e6913103d7ff..b1455dc2366f 100644 u64 deadline; }; -- -2.43.0 +2.44.0 |