41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 9c1b4fa3029e4d539bfca9df0b6dd5ed4f589619 Mon Sep 17 00:00:00 2001
|
|
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
|
|
Date: Tue, 27 Sep 2011 08:40:24 -0400
|
|
Subject: [PATCH 173/290] sched: Do not compare cpu masks in scheduler
|
|
|
|
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Clark Williams <williams@redhat.com>
|
|
Link: http://lkml.kernel.org/r/20110927124423.128129033@goodmis.org
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
kernel/sched.c | 14 +++++---------
|
|
1 file changed, 5 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/kernel/sched.c b/kernel/sched.c
|
|
index 27d114a..08189cd 100644
|
|
--- a/kernel/sched.c
|
|
+++ b/kernel/sched.c
|
|
@@ -4577,16 +4577,12 @@ static inline void update_migrate_disable(struct task_struct *p)
|
|
*/
|
|
mask = tsk_cpus_allowed(p);
|
|
|
|
- WARN_ON(!cpumask_test_cpu(smp_processor_id(), mask));
|
|
+ if (p->sched_class->set_cpus_allowed)
|
|
+ p->sched_class->set_cpus_allowed(p, mask);
|
|
+ p->rt.nr_cpus_allowed = cpumask_weight(mask);
|
|
|
|
- if (!cpumask_equal(&p->cpus_allowed, mask)) {
|
|
- if (p->sched_class->set_cpus_allowed)
|
|
- p->sched_class->set_cpus_allowed(p, mask);
|
|
- p->rt.nr_cpus_allowed = cpumask_weight(mask);
|
|
-
|
|
- /* Let migrate_enable know to fix things back up */
|
|
- p->migrate_disable |= MIGRATE_DISABLE_SET_AFFIN;
|
|
- }
|
|
+ /* Let migrate_enable know to fix things back up */
|
|
+ p->migrate_disable |= MIGRATE_DISABLE_SET_AFFIN;
|
|
}
|
|
|
|
void migrate_disable(void)
|