---

yaml
---
r: 121343
b: refs/heads/master
c: d65bd5e
h: refs/heads/master
i:
  121341: a828c04
  121339: 3faf8ac
  121335: 3b90824
  121327: 6ae45db
  121311: 882c8ed
  121279: ae4a5d8
  121215: 2883d1d
  121087: 0d6bdd5
  120831: a6e573c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee79d1bdb6a10499e53f80b1e8d14110215178ba
+refs/heads/master: d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c

trunk/kernel/sched.c

@@ -7774,17 +7774,21 @@ void partition_sched_domains(int ndoms_new, cpumask_t *doms_new,
 			     struct sched_domain_attr *dattr_new)
 {
 	int i, j, n;
+	int new_topology;
 
 	mutex_lock(&sched_domains_mutex);
 
 	/* always unregister in case we don't destroy any domains */
 	unregister_sched_domain_sysctl();
 
+	/* Let architecture update cpu core mappings. */
+	new_topology = arch_update_cpu_topology();
+
 	n = doms_new ? ndoms_new : 0;
 
 	/* Destroy deleted domains */
 	for (i = 0; i < ndoms_cur; i++) {
-		for (j = 0; j < n; j++) {
+		for (j = 0; j < n && !new_topology; j++) {
 			if (cpus_equal(doms_cur[i], doms_new[j])
 			    && dattrs_equal(dattr_cur, i, dattr_new, j))
 				goto match1;
@@ -7804,7 +7808,7 @@ void partition_sched_domains(int ndoms_new, cpumask_t *doms_new,
 
 	/* Build new domains */
 	for (i = 0; i < ndoms_new; i++) {
-		for (j = 0; j < ndoms_cur; j++) {
+		for (j = 0; j < ndoms_cur && !new_topology; j++) {
 			if (cpus_equal(doms_new[i], doms_cur[j])
 			    && dattrs_equal(dattr_new, i, dattr_cur, j))
 				goto match2;