diff options
| -rw-r--r-- | xen/common/domctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xen/common/domctl.c b/xen/common/domctl.c index c653efb74b..9760d50955 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -230,15 +230,15 @@ static unsigned int default_vcpu0_location(cpumask_t *online) */ cpumask_copy(&cpu_exclude_map, per_cpu(cpu_sibling_mask, 0)); cpu = cpumask_first(&cpu_exclude_map); - if ( cpumask_weight(&cpu_exclude_map) > 1 ) - cpu = cpumask_next(cpu, &cpu_exclude_map); - ASSERT(cpu < nr_cpu_ids); + i = cpumask_next(cpu, &cpu_exclude_map); + if ( i < nr_cpu_ids ) + cpu = i; for_each_cpu(i, online) { if ( cpumask_test_cpu(i, &cpu_exclude_map) ) continue; if ( (i == cpumask_first(per_cpu(cpu_sibling_mask, i))) && - (cpumask_weight(per_cpu(cpu_sibling_mask, i)) > 1) ) + (cpumask_next(i, per_cpu(cpu_sibling_mask, i)) < nr_cpu_ids) ) continue; cpumask_or(&cpu_exclude_map, &cpu_exclude_map, per_cpu(cpu_sibling_mask, i)); |