summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0010-sched-Add-migrate_disable.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0010-sched-Add-migrate_disable.patch')
-rw-r--r--debian/patches-rt/0010-sched-Add-migrate_disable.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0010-sched-Add-migrate_disable.patch b/debian/patches-rt/0010-sched-Add-migrate_disable.patch
index d0ea31279..e8ff7eed1 100644
--- a/debian/patches-rt/0010-sched-Add-migrate_disable.patch
+++ b/debian/patches-rt/0010-sched-Add-migrate_disable.patch
@@ -1,8 +1,8 @@
-From e9f7c2225ee3e1ce9317762393618c1c81a8febe Mon Sep 17 00:00:00 2001
+From 3cf19c15a535037d72750850355628790cfb36d4 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Fri, 23 Oct 2020 12:12:07 +0200
Subject: [PATCH 010/323] sched: Add migrate_disable()
-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
Add the base migrate_disable() support (under protest).
@@ -24,7 +24,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
5 files changed, 183 insertions(+), 8 deletions(-)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index 7d9c1c0e149c..97ba7c920653 100644
+index 7d9c1c0e149c0..97ba7c920653d 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -322,6 +322,69 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,
@@ -105,7 +105,7 @@ index 7d9c1c0e149c..97ba7c920653 100644
+
#endif /* __LINUX_PREEMPT_H */
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index aa015416c569..76907e9876d5 100644
+index aa015416c5693..76907e9876d55 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -726,6 +726,9 @@ struct task_struct {
@@ -119,7 +119,7 @@ index aa015416c569..76907e9876d5 100644
#ifdef CONFIG_PREEMPT_RCU
int rcu_read_lock_nesting;
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 569cc5e48e68..5c9db4b2b6ec 100644
+index 569cc5e48e681..5c9db4b2b6ec7 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1710,6 +1710,61 @@ void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags)
@@ -313,7 +313,7 @@ index 569cc5e48e68..5c9db4b2b6ec 100644
trace_sched_switch(preempt, prev, next);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index f0f396cc1bee..f3109adda484 100644
+index f0f396cc1bee6..f3109adda484e 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1906,14 +1906,16 @@ static inline bool sched_fair_runnable(struct rq *rq)
@@ -336,7 +336,7 @@ index f0f396cc1bee..f3109adda484 100644
#endif
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
-index 2916606a9333..dbb96ebf661f 100644
+index 2916606a93337..dbb96ebf661fd 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -26,6 +26,11 @@ unsigned int check_preemption_disabled(const char *what1, const char *what2)
@@ -352,5 +352,5 @@ index 2916606a9333..dbb96ebf661f 100644
* It is valid to assume CPU-locality during early bootup:
*/
--
-2.43.0
+2.44.0