From b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 19:40:22 +0200 Subject: Merging debian version 6.7.7-1. Signed-off-by: Daniel Baumann --- .../0003-sched-Extract-__schedule_loop.patch | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 debian/patches-rt/0003-sched-Extract-__schedule_loop.patch (limited to 'debian/patches-rt/0003-sched-Extract-__schedule_loop.patch') diff --git a/debian/patches-rt/0003-sched-Extract-__schedule_loop.patch b/debian/patches-rt/0003-sched-Extract-__schedule_loop.patch deleted file mode 100644 index a236df5321..0000000000 --- a/debian/patches-rt/0003-sched-Extract-__schedule_loop.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Thomas Gleixner -Date: Fri, 8 Sep 2023 18:22:50 +0200 -Subject: [PATCH 3/7] sched: Extract __schedule_loop() -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz - -There are currently two implementations of this basic __schedule() -loop, and there is soon to be a third. - -Signed-off-by: Thomas Gleixner -Signed-off-by: Sebastian Andrzej Siewior -Signed-off-by: Peter Zijlstra (Intel) -Link: https://lkml.kernel.org/r/20230908162254.999499-4-bigeasy@linutronix.de ---- - kernel/sched/core.c | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -6771,16 +6771,21 @@ static void sched_update_worker(struct t - } - } - --asmlinkage __visible void __sched schedule(void) -+static __always_inline void __schedule_loop(unsigned int sched_mode) - { -- struct task_struct *tsk = current; -- -- sched_submit_work(tsk); - do { - preempt_disable(); -- __schedule(SM_NONE); -+ __schedule(sched_mode); - sched_preempt_enable_no_resched(); - } while (need_resched()); -+} -+ -+asmlinkage __visible void __sched schedule(void) -+{ -+ struct task_struct *tsk = current; -+ -+ sched_submit_work(tsk); -+ __schedule_loop(SM_NONE); - sched_update_worker(tsk); - } - EXPORT_SYMBOL(schedule); -@@ -6844,11 +6849,7 @@ void __sched schedule_preempt_disabled(v - #ifdef CONFIG_PREEMPT_RT - void __sched notrace schedule_rtlock(void) - { -- do { -- preempt_disable(); -- __schedule(SM_RTLOCK_WAIT); -- sched_preempt_enable_no_resched(); -- } while (need_resched()); -+ __schedule_loop(SM_RTLOCK_WAIT); - } - NOKPROBE_SYMBOL(schedule_rtlock); - #endif -- cgit v1.2.3