diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:21:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:22:00 +0000 |
commit | 9b228b28ccd91b2f915f0575b7d67a8610b72d30 (patch) | |
tree | 3197d6e68ec1f053a5d60a1e0d84fa334ac486f1 /debian/patches-rt/0155-sched-migrate_disable-fallback-to-preempt_disable-in.patch | |
parent | Merging upstream version 4.19.304. (diff) | |
download | linux-9b228b28ccd91b2f915f0575b7d67a8610b72d30.tar.xz linux-9b228b28ccd91b2f915f0575b7d67a8610b72d30.zip |
Merging debian version 4.19.304-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0155-sched-migrate_disable-fallback-to-preempt_disable-in.patch')
-rw-r--r-- | debian/patches-rt/0155-sched-migrate_disable-fallback-to-preempt_disable-in.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0155-sched-migrate_disable-fallback-to-preempt_disable-in.patch b/debian/patches-rt/0155-sched-migrate_disable-fallback-to-preempt_disable-in.patch index 52c0508d4..fc576ebc0 100644 --- a/debian/patches-rt/0155-sched-migrate_disable-fallback-to-preempt_disable-in.patch +++ b/debian/patches-rt/0155-sched-migrate_disable-fallback-to-preempt_disable-in.patch @@ -1,8 +1,8 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Thu, 5 Jul 2018 14:44:51 +0200 -Subject: [PATCH 155/353] sched/migrate_disable: fallback to preempt_disable() +Subject: [PATCH 155/354] sched/migrate_disable: fallback to preempt_disable() instead barrier() -Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=042d278b7e7b9f28417ae7c95ad95ba83065b1de +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=6995caad3506ab5555fb756e251a94909ebaf0c7 On SMP + !RT migrate_disable() is still around. It is not part of spin_lock() anymore so it has almost no users. However the futex code has a workaround for @@ -46,7 +46,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/include/linux/preempt.h b/include/linux/preempt.h -index 9eafc34898b4..ed8413e7140f 100644 +index 13e3f889b335..302f491b05ec 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -204,7 +204,7 @@ do { \ |