summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch')
-rw-r--r--debian/patches-rt/0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches-rt/0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch b/debian/patches-rt/0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch
index 094346cdd..036b71e0a 100644
--- a/debian/patches-rt/0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch
+++ b/debian/patches-rt/0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch
@@ -2,7 +2,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 6 Oct 2020 13:07:17 +0200
Subject: [PATCH 22/22] locking/rtmutex: Use custom scheduling function for
spin-schedule()
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.8-rt24.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.21-rt34.tar.xz
PREEMPT_RT builds the rwsem, mutex, spinlock and rwlock typed locks on
top of a rtmutex lock. While blocked task->pi_blocked_on is set
@@ -121,7 +121,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -4981,7 +4981,7 @@ pick_next_task(struct rq *rq, struct tas
+@@ -4978,7 +4978,7 @@ pick_next_task(struct rq *rq, struct tas
*
* WARNING: must be called with preemption disabled!
*/
@@ -130,7 +130,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
{
struct task_struct *prev, *next;
unsigned long *switch_count;
-@@ -5034,7 +5034,7 @@ static void __sched notrace __schedule(b
+@@ -5031,7 +5031,7 @@ static void __sched notrace __schedule(b
* - ptrace_{,un}freeze_traced() can change ->state underneath us.
*/
prev_state = prev->state;
@@ -139,7 +139,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (signal_pending_state(prev_state, prev)) {
prev->state = TASK_RUNNING;
} else {
-@@ -5118,7 +5118,7 @@ void __noreturn do_task_dead(void)
+@@ -5115,7 +5115,7 @@ void __noreturn do_task_dead(void)
/* Tell freezer to ignore us: */
current->flags |= PF_NOFREEZE;
@@ -148,7 +148,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
BUG();
/* Avoid "noreturn function does return" - but don't continue if BUG() is a NOP: */
-@@ -5151,9 +5151,6 @@ static inline void sched_submit_work(str
+@@ -5148,9 +5148,6 @@ static inline void sched_submit_work(str
preempt_enable_no_resched();
}
@@ -158,7 +158,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* If we are going to sleep and we have plugged IO queued,
* make sure to submit it to avoid deadlocks.
-@@ -5179,7 +5176,7 @@ asmlinkage __visible void __sched schedu
+@@ -5176,7 +5173,7 @@ asmlinkage __visible void __sched schedu
sched_submit_work(tsk);
do {
preempt_disable();
@@ -167,7 +167,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
sched_preempt_enable_no_resched();
} while (need_resched());
sched_update_worker(tsk);
-@@ -5207,7 +5204,7 @@ void __sched schedule_idle(void)
+@@ -5204,7 +5201,7 @@ void __sched schedule_idle(void)
*/
WARN_ON_ONCE(current->state);
do {
@@ -176,7 +176,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
} while (need_resched());
}
-@@ -5260,7 +5257,7 @@ static void __sched notrace preempt_sche
+@@ -5257,7 +5254,7 @@ static void __sched notrace preempt_sche
*/
preempt_disable_notrace();
preempt_latency_start(1);
@@ -185,7 +185,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
preempt_latency_stop(1);
preempt_enable_no_resched_notrace();
-@@ -5290,6 +5287,19 @@ asmlinkage __visible void __sched notrac
+@@ -5287,6 +5284,19 @@ asmlinkage __visible void __sched notrac
NOKPROBE_SYMBOL(preempt_schedule);
EXPORT_SYMBOL(preempt_schedule);
@@ -205,7 +205,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/**
* preempt_schedule_notrace - preempt_schedule called by tracing
*
-@@ -5333,7 +5343,7 @@ asmlinkage __visible void __sched notrac
+@@ -5330,7 +5340,7 @@ asmlinkage __visible void __sched notrac
* an infinite recursion.
*/
prev_ctx = exception_enter();
@@ -214,7 +214,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
exception_exit(prev_ctx);
preempt_latency_stop(1);
-@@ -5362,7 +5372,7 @@ asmlinkage __visible void __sched preemp
+@@ -5359,7 +5369,7 @@ asmlinkage __visible void __sched preemp
do {
preempt_disable();
local_irq_enable();