summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0016-sched-Fix-migrate_disable-vs-rt-dl-balancing.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0016-sched-Fix-migrate_disable-vs-rt-dl-balancing.patch')
-rw-r--r--debian/patches-rt/0016-sched-Fix-migrate_disable-vs-rt-dl-balancing.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches-rt/0016-sched-Fix-migrate_disable-vs-rt-dl-balancing.patch b/debian/patches-rt/0016-sched-Fix-migrate_disable-vs-rt-dl-balancing.patch
index b665e6d22..36a08d203 100644
--- a/debian/patches-rt/0016-sched-Fix-migrate_disable-vs-rt-dl-balancing.patch
+++ b/debian/patches-rt/0016-sched-Fix-migrate_disable-vs-rt-dl-balancing.patch
@@ -1,8 +1,8 @@
-From 8121011ded919f172bbbc7f5c095ca29d83a5aed Mon Sep 17 00:00:00 2001
+From 482622f4a87970b97449709db1b848c96f971fed Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Fri, 23 Oct 2020 12:12:13 +0200
Subject: [PATCH 016/323] sched: Fix migrate_disable() vs rt/dl balancing
-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 order to minimize the interference of migrate_disable() on lower
priority tasks, which can be deprived of runtime due to being stuck
@@ -35,7 +35,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
6 files changed, 186 insertions(+), 48 deletions(-)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index 97ba7c920653..8b43922e65df 100644
+index 97ba7c920653d..8b43922e65dfe 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -325,24 +325,28 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,
@@ -86,7 +86,7 @@ index 97ba7c920653..8b43922e65df 100644
*
* The reason we have it anyway.
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 5b5c194f5a62..7ca1f3e740dd 100644
+index 5b5c194f5a62d..7ca1f3e740ddd 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -728,8 +728,9 @@ struct task_struct {
@@ -101,7 +101,7 @@ index 5b5c194f5a62..7ca1f3e740dd 100644
#ifdef CONFIG_PREEMPT_RCU
int rcu_read_lock_nesting;
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index abbf01f77a76..452fc1dfb143 100644
+index abbf01f77a76f..452fc1dfb1434 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1777,11 +1777,6 @@ void migrate_enable(void)
@@ -214,7 +214,7 @@ index abbf01f77a76..452fc1dfb143 100644
{
return false;
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
-index 94977a6ced8b..7cf3248894a9 100644
+index 94977a6ced8b8..7cf3248894a98 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -2139,6 +2139,9 @@ static int push_dl_task(struct rq *rq)
@@ -287,7 +287,7 @@ index 94977a6ced8b..7cf3248894a9 100644
.task_tick = task_tick_dl,
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
-index f91339c0dee8..c25e35f41555 100644
+index 95c07ef87ce17..c916dbc2a0165 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1873,7 +1873,7 @@ static struct task_struct *pick_next_pushable_task(struct rq *rq)
@@ -427,7 +427,7 @@ index f91339c0dee8..c25e35f41555 100644
.task_tick = task_tick_rt,
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index 8237c9ab2bb8..69ef7cac3d29 100644
+index 8237c9ab2bb86..69ef7cac3d296 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1061,6 +1061,8 @@ struct rq {
@@ -491,5 +491,5 @@ index 8237c9ab2bb8..69ef7cac3d29 100644
#ifdef CONFIG_CPU_IDLE
--
-2.43.0
+2.44.0