From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 6 Dec 2007 15:44:05 +0000 (+0000)
Subject: xen smpboot: Fix a merge oversight.
X-Git-Tag: xen-3.2.0~66
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f478027733201fe0a8fe2ca03e95f4ac237c202d;p=legacy%2Flinux-2.6.18-xen.git

xen smpboot: Fix a merge oversight.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/drivers/xen/core/smpboot.c b/drivers/xen/core/smpboot.c
index 3ea0309c..6931c97c 100644
--- a/drivers/xen/core/smpboot.c
+++ b/drivers/xen/core/smpboot.c
@@ -38,10 +38,6 @@ extern void smp_trap_init(trap_info_t *);
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
-int phys_proc_id[NR_CPUS]; /* Package ID of each logical CPU */
-EXPORT_SYMBOL(phys_proc_id);
-int cpu_core_id[NR_CPUS]; /* Core ID of each logical CPU */
-EXPORT_SYMBOL(cpu_core_id);
 
 cpumask_t cpu_online_map;
 EXPORT_SYMBOL(cpu_online_map);
@@ -98,8 +94,8 @@ void __init smp_alloc_memory(void)
 static inline void
 set_cpu_sibling_map(int cpu)
 {
-	phys_proc_id[cpu] = cpu;
-	cpu_core_id[cpu]  = 0;
+	cpu_data[cpu].phys_proc_id = cpu;
+	cpu_data[cpu].cpu_core_id  = 0;
 
 	cpu_sibling_map[cpu] = cpumask_of_cpu(cpu);
 	cpu_core_map[cpu]    = cpumask_of_cpu(cpu);
@@ -110,8 +106,8 @@ set_cpu_sibling_map(int cpu)
 static void
 remove_siblinginfo(int cpu)
 {
-	phys_proc_id[cpu] = BAD_APICID;
-	cpu_core_id[cpu]  = BAD_APICID;
+	cpu_data[cpu].phys_proc_id = BAD_APICID;
+	cpu_data[cpu].cpu_core_id  = BAD_APICID;
 
 	cpus_clear(cpu_sibling_map[cpu]);
 	cpus_clear(cpu_core_map[cpu]);