Revert "partition_sched_domains: Do not destroy old sched domain on cpu_up"
This reverts commit e0473b4aafe9013a27749518afd449594f158b04.
Since sched domains are allocated dynamically now, these
changes are N/A for 3.0. Hence the revert.
Change-Id: I3ac329f298107f4ebdee6a1aab771d2be8ca5f5c
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
diff --git a/kernel/sched.c b/kernel/sched.c
index 232c1c0..b85f675 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7653,7 +7653,6 @@
{
int i, j, n;
int new_topology;
- cpumask_var_t doms_temp;
mutex_lock(&sched_domains_mutex);
@@ -7663,20 +7662,14 @@
/* Let architecture update cpu core mappings. */
new_topology = arch_update_cpu_topology();
- cpumask_andnot(doms_temp, cpu_active_mask, cpu_isolated_map);
-
n = doms_new ? ndoms_new : 0;
/* Destroy deleted domains */
for (i = 0; i < ndoms_cur; i++) {
- if (!new_topology) {
- if ((n == 0) && cpumask_subset(doms_cur[i], doms_temp))
+ for (j = 0; j < n && !new_topology; j++) {
+ if (cpumask_equal(doms_cur[i], doms_new[j])
+ && dattrs_equal(dattr_cur, i, dattr_new, j))
goto match1;
- for (j = 0; j < n; j++) {
- if (cpumask_equal(doms_cur[i], doms_new[j])
- && dattrs_equal(dattr_cur, i, dattr_new, j))
- goto match1;
- }
}
/* no match - a current sched domain not in new doms_new[] */
detach_destroy_domains(doms_cur[i]);