Skip to content

Commit

Permalink
x86: remove x86_cpu_to_log_apicid
Browse files Browse the repository at this point in the history
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: Mike Travis <travis@sgi.com>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Mike Travis authored and Thomas Gleixner committed Oct 17, 2007
1 parent 61d08a9 commit 9efa981
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 5 deletions.
2 changes: 0 additions & 2 deletions arch/x86/kernel/genapic_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/genapic_flat_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/smpboot_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion include/asm-x86/smp_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9efa981

Please sign in to comment.