Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9efa9815 authored by Mike Travis's avatar Mike Travis Committed by Thomas Gleixner
Browse files

x86: remove x86_cpu_to_log_apicid 



Remove the x86_cpu_to_log_apicid array.  It is set in
arch/x86_64/kernel/genapic_flat.c:flat_init_apic_ldr() and
arch/x86_64/kernel/smpboot.c:do_boot_cpu() but it is never
referenced.

[ tglx: arch/x86 adaptation ]

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 61d08a9e

arch/x86/kernel/genapic_64.c

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly 
					= { [0 ... NR_CPUS-1] = BAD_APICID };

EXPORT_SYMBOL(x86_cpu_to_apicid);



u8 x86_cpu_to_log_apicid[NR_CPUS]	= { [0 ... NR_CPUS-1] = BAD_APICID };



struct genapic __read_mostly *genapic = &apic_flat;



/*

arch/x86/kernel/genapic_flat_64.c

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ static void flat_init_apic_ldr(void) 


	num = smp_processor_id();

	id = 1UL << num;

	x86_cpu_to_log_apicid[num] = id;

	apic_write(APIC_DFR, APIC_DFR_FLAT);

	val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;

	val |= SET_APIC_LOGICAL_ID(id);

arch/x86/kernel/smpboot_64.c

+0 −1
Original line number Diff line number Diff line
@@ -695,7 +695,6 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid) 
		cpu_clear(cpu, cpu_present_map);

		cpu_clear(cpu, cpu_possible_map);

		x86_cpu_to_apicid[cpu] = BAD_APICID;

		x86_cpu_to_log_apicid[cpu] = BAD_APICID;

		return -EIO;

	}

include/asm-x86/smp_64.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ static inline int hard_smp_processor_id(void) 
 * the real APIC ID <-> CPU # mapping.

 */

extern u8 x86_cpu_to_apicid[NR_CPUS];	/* physical ID */

extern u8 x86_cpu_to_log_apicid[NR_CPUS];

extern u8 bios_cpu_apicid[];



static inline int cpu_present_to_apicid(int mps_cpu)