diff options
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 | 16 |
1 files changed, 8 insertions, 8 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 2c050e602..abfc8a741 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/351] sched/migrate_disable: fallback to preempt_disable() +Subject: [PATCH 155/353] 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=45c69023a6783aef1cdde83c05006953e80582b6 +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=72fc975c09efd55a42502cd8ae4346f9e884afba 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 @@ -93,10 +93,10 @@ index 08971062c194..3bc6b3206e14 100644 # endif #endif diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 22b49744a3d9..630e726acdd2 100644 +index 9e6b8b3cdd88..4a714c92dff2 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -1031,7 +1031,7 @@ void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_ma +@@ -1034,7 +1034,7 @@ void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_ma p->nr_cpus_allowed = cpumask_weight(new_mask); } @@ -105,7 +105,7 @@ index 22b49744a3d9..630e726acdd2 100644 int __migrate_disabled(struct task_struct *p) { return p->migrate_disable; -@@ -1071,7 +1071,7 @@ static void __do_set_cpus_allowed_tail(struct task_struct *p, +@@ -1074,7 +1074,7 @@ static void __do_set_cpus_allowed_tail(struct task_struct *p, void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) { @@ -114,7 +114,7 @@ index 22b49744a3d9..630e726acdd2 100644 if (__migrate_disabled(p)) { lockdep_assert_held(&p->pi_lock); -@@ -1145,7 +1145,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, +@@ -1148,7 +1148,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, if (cpumask_test_cpu(task_cpu(p), new_mask) || __migrate_disabled(p)) goto out; @@ -123,7 +123,7 @@ index 22b49744a3d9..630e726acdd2 100644 if (__migrate_disabled(p)) { p->migrate_disable_update = 1; goto out; -@@ -7205,7 +7205,7 @@ const u32 sched_prio_to_wmult[40] = { +@@ -7207,7 +7207,7 @@ const u32 sched_prio_to_wmult[40] = { #undef CREATE_TRACE_POINTS @@ -132,7 +132,7 @@ index 22b49744a3d9..630e726acdd2 100644 static inline void update_nr_migratory(struct task_struct *p, long delta) -@@ -7353,45 +7353,44 @@ EXPORT_SYMBOL(migrate_enable); +@@ -7355,45 +7355,44 @@ EXPORT_SYMBOL(migrate_enable); #elif !defined(CONFIG_SMP) && defined(CONFIG_PREEMPT_RT_BASE) void migrate_disable(void) { |