From: "Jan Beulich" Subject: [PATCH] linux-2.6.18: eliminate cpu_2_logical_apicid Date: Tue, 02 Nov 2010 08:18:39 +0000 Message-ID: <4CCFD76F0200007800020372@vpn.id2.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 This variable must have become orphaned by a merge predating the 2.6.16 one. Signed-off-by: Jan Beulich --- a/drivers/xen/core/smpboot.c +++ b/drivers/xen/core/smpboot.c @@ -53,8 +53,6 @@ static DEFINE_PER_CPU(int, callfunc_irq) static char resched_name[NR_CPUS][15]; static char callfunc_name[NR_CPUS][15]; =20 -u8 cpu_2_logical_apicid[NR_CPUS] =3D { [0 ... NR_CPUS-1] =3D BAD_APICID = }; - cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned; cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; EXPORT_SYMBOL(cpu_core_map); @@ -274,7 +272,6 @@ void __init smp_prepare_cpus(unsigned in boot_cpu_data.apicid =3D apicid; cpu_data[0] =3D boot_cpu_data; =20 - cpu_2_logical_apicid[0] =3D apicid; x86_cpu_to_apicid[0] =3D apicid; =20 current_thread_info()->cpu =3D 0; @@ -331,7 +328,6 @@ void __init smp_prepare_cpus(unsigned in cpu_data[cpu] =3D boot_cpu_data; cpu_data[cpu].apicid =3D apicid; =20 - cpu_2_logical_apicid[cpu] =3D apicid; x86_cpu_to_apicid[cpu] =3D apicid; =20 idle =3D fork_idle(cpu);