From: "Jan Beulich" Subject: [PATCH] another 2.6.18 merge oversight Date: Thu, 06 Dec 2007 15:20:27 +0000 Message-ID: <4758214B.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org 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 Index: head-2007-11-30/drivers/xen/core/smpboot.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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.0000000= 00 +0100 @@ -38,10 +38,6 @@ extern void smp_trap_init(trap_info_t *) =20 /* Number of siblings per CPU package */ int smp_num_siblings =3D 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); =20 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] =3D cpu; - cpu_core_id[cpu] =3D 0; + cpu_data[cpu].phys_proc_id =3D cpu; + cpu_data[cpu].cpu_core_id =3D 0; =20 cpu_sibling_map[cpu] =3D cpumask_of_cpu(cpu); cpu_core_map[cpu] =3D cpumask_of_cpu(cpu); @@ -110,8 +106,8 @@ set_cpu_sibling_map(int cpu) static void remove_siblinginfo(int cpu) { - phys_proc_id[cpu] =3D BAD_APICID; - cpu_core_id[cpu] =3D BAD_APICID; + cpu_data[cpu].phys_proc_id =3D BAD_APICID; + cpu_data[cpu].cpu_core_id =3D BAD_APICID; =20 cpus_clear(cpu_sibling_map[cpu]); cpus_clear(cpu_core_map[cpu]);