From 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 19:45:38 +0200 Subject: Merging debian version 5.10.216-1. Signed-off-by: Daniel Baumann --- ...-rtmutex-add-sleeping-lock-implementation.patch | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'debian/patches-rt/0170-locking-rtmutex-add-sleeping-lock-implementation.patch') diff --git a/debian/patches-rt/0170-locking-rtmutex-add-sleeping-lock-implementation.patch b/debian/patches-rt/0170-locking-rtmutex-add-sleeping-lock-implementation.patch index e8755a734..c55f0f504 100644 --- a/debian/patches-rt/0170-locking-rtmutex-add-sleeping-lock-implementation.patch +++ b/debian/patches-rt/0170-locking-rtmutex-add-sleeping-lock-implementation.patch @@ -1,8 +1,8 @@ -From 4c85c347eeb7dae59269d3a4a07388a00de563bf Mon Sep 17 00:00:00 2001 +From ba83adc3650c153ab5646945ab0690cc30240b21 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 12 Oct 2017 17:11:19 +0200 Subject: [PATCH 170/323] locking/rtmutex: add sleeping lock implementation -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 Signed-off-by: Thomas Gleixner Signed-off-by: Sebastian Andrzej Siewior @@ -24,7 +24,7 @@ Signed-off-by: Luis Claudio R. Goncalves create mode 100644 include/linux/spinlock_types_rt.h diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 55d48d5627c7..7b4fdd5b2f7b 100644 +index 55d48d5627c71..7b4fdd5b2f7ba 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -223,6 +223,10 @@ extern void __cant_migrate(const char *file, int line); @@ -47,7 +47,7 @@ index 55d48d5627c7..7b4fdd5b2f7b 100644 # define cant_migrate() do { } while (0) # define sched_annotate_sleep() do { } while (0) diff --git a/include/linux/preempt.h b/include/linux/preempt.h -index 9881eac0698f..4d244e295e85 100644 +index 9881eac0698fd..4d244e295e855 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -121,7 +121,11 @@ @@ -63,7 +63,7 @@ index 9881eac0698f..4d244e295e85 100644 /* * The preempt_count offset needed for things like: diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h -index b828b938c876..b02009f53026 100644 +index b828b938c8769..b02009f530263 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h @@ -19,6 +19,10 @@ @@ -109,7 +109,7 @@ index b828b938c876..b02009f53026 100644 #define DEFINE_RT_MUTEX(mutexname) \ struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname) diff --git a/include/linux/sched.h b/include/linux/sched.h -index 73defe42fd23..3650fdaac4ca 100644 +index 73defe42fd23d..3650fdaac4caa 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -141,6 +141,9 @@ struct io_uring_task; @@ -141,7 +141,7 @@ index 73defe42fd23..3650fdaac4ca 100644 #ifdef CONFIG_RT_MUTEXES /* PI waiters blocked on a rt_mutex held by this task: */ diff --git a/include/linux/sched/wake_q.h b/include/linux/sched/wake_q.h -index 26a2013ac39c..6e2dff721547 100644 +index 26a2013ac39c4..6e2dff721547c 100644 --- a/include/linux/sched/wake_q.h +++ b/include/linux/sched/wake_q.h @@ -58,6 +58,17 @@ static inline bool wake_q_empty(struct wake_q_head *head) @@ -165,7 +165,7 @@ index 26a2013ac39c..6e2dff721547 100644 #endif /* _LINUX_SCHED_WAKE_Q_H */ diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h new file mode 100644 -index 000000000000..3085132eae38 +index 0000000000000..3085132eae383 --- /dev/null +++ b/include/linux/spinlock_rt.h @@ -0,0 +1,155 @@ @@ -326,7 +326,7 @@ index 000000000000..3085132eae38 +#endif diff --git a/include/linux/spinlock_types_rt.h b/include/linux/spinlock_types_rt.h new file mode 100644 -index 000000000000..446da786e5d5 +index 0000000000000..446da786e5d5c --- /dev/null +++ b/include/linux/spinlock_types_rt.h @@ -0,0 +1,38 @@ @@ -369,7 +369,7 @@ index 000000000000..446da786e5d5 + +#endif diff --git a/kernel/futex/core.c b/kernel/futex/core.c -index 706cd446ec71..909dcd708a52 100644 +index 706cd446ec719..909dcd708a527 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -1508,6 +1508,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_pi_state *pi_ @@ -417,7 +417,7 @@ index 706cd446ec71..909dcd708a52 100644 ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); if (unlikely(ret != 0)) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c -index 40ae934c6caa..35cdbbb5daa9 100644 +index 40ae934c6caa7..35cdbbb5daa93 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -8,6 +8,11 @@ @@ -1081,7 +1081,7 @@ index 40ae934c6caa..35cdbbb5daa9 100644 return ret; diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h -index 9d1e974ca9c3..c1a280167e3c 100644 +index 9d1e974ca9c34..c1a280167e3cc 100644 --- a/kernel/locking/rtmutex_common.h +++ b/kernel/locking/rtmutex_common.h @@ -31,6 +31,7 @@ struct rt_mutex_waiter { @@ -1128,7 +1128,7 @@ index 9d1e974ca9c3..c1a280167e3c 100644 #ifdef CONFIG_DEBUG_RT_MUTEXES # include "rtmutex-debug.h" diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index f6d40256c0d4..be5d41ed6ff2 100644 +index f6d40256c0d4c..be5d41ed6ff21 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -511,9 +511,15 @@ static bool set_nr_if_polling(struct task_struct *p) @@ -1210,5 +1210,5 @@ index f6d40256c0d4..be5d41ed6ff2 100644 } } -- -2.43.0 +2.44.0 -- cgit v1.2.3