As usual, written and tested against 2.6.24-rc3 and made apply against
2.6.18 without further testing.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: head-2007-11-30/drivers/xen/core/smpboot.c
==================================================================---
head-2007-11-30.orig/drivers/xen/core/smpboot.c 2007-12-04 12:47:19.000000000
+0100
+++ head-2007-11-30/drivers/xen/core/smpboot.c 2007-12-04 12:49:02.000000000
+0100
@@ -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]);
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel