diff options
Diffstat (limited to 'arch/x86/xen/smp.c')
-rw-r--r-- | arch/x86/xen/smp.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 557b8e24706a..539d42530fc4 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
@@ -148,7 +148,12 @@ void __init xen_smp_prepare_boot_cpu(void) | |||
148 | 148 | ||
149 | for (cpu = 0; cpu < NR_CPUS; cpu++) { | 149 | for (cpu = 0; cpu < NR_CPUS; cpu++) { |
150 | cpus_clear(cpu_sibling_map[cpu]); | 150 | cpus_clear(cpu_sibling_map[cpu]); |
151 | cpus_clear(cpu_core_map[cpu]); | 151 | /* |
152 | * cpu_core_map lives in a per cpu area that is cleared | ||
153 | * when the per cpu array is allocated. | ||
154 | * | ||
155 | * cpus_clear(per_cpu(cpu_core_map, cpu)); | ||
156 | */ | ||
152 | } | 157 | } |
153 | 158 | ||
154 | xen_setup_vcpu_info_placement(); | 159 | xen_setup_vcpu_info_placement(); |
@@ -160,7 +165,12 @@ void __init xen_smp_prepare_cpus(unsigned int max_cpus) | |||
160 | 165 | ||
161 | for (cpu = 0; cpu < NR_CPUS; cpu++) { | 166 | for (cpu = 0; cpu < NR_CPUS; cpu++) { |
162 | cpus_clear(cpu_sibling_map[cpu]); | 167 | cpus_clear(cpu_sibling_map[cpu]); |
163 | cpus_clear(cpu_core_map[cpu]); | 168 | /* |
169 | * cpu_core_ map will be zeroed when the per | ||
170 | * cpu area is allocated. | ||
171 | * | ||
172 | * cpus_clear(per_cpu(cpu_core_map, cpu)); | ||
173 | */ | ||
164 | } | 174 | } |
165 | 175 | ||
166 | smp_store_cpu_info(0); | 176 | smp_store_cpu_info(0); |