[Xen-changelog] [xen-3.1-testing] xen smpboot: Fix a merge oversight.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196963105 0
# Node ID 3abe38e37d18820227508c7c51540b615a9df912
# Parent  b48655a325e095c21ba207117f6309955d642e4a
xen smpboot: Fix a merge oversight.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
linux-2.6.18-xen changeset:   340:69bb553015ce4ef88e33bd296a3f1a38011c7fa3
linux-2.6.18-xen date:        Thu Dec 06 15:44:05 2007 +0000
---
 linux-2.6-xen-sparse/drivers/xen/core/smpboot.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff -r b48655a325e0 -r 3abe38e37d18 
linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Thu Dec 06 17:44:35 
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c   Thu Dec 06 17:45:05 
2007 +0000
@@ -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 @@ static inline 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 @@ static void
 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]);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog