diff options
-rw-r--r-- | arch/x86/kernel/genapic_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/genapic_flat_64.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/smpboot_64.c | 1 | ||||
-rw-r--r-- | include/asm-x86/smp_64.h | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c index 47496a40e84f..4ae03e3e8294 100644 --- a/arch/x86/kernel/genapic_64.c +++ b/arch/x86/kernel/genapic_64.c | |||
@@ -29,8 +29,6 @@ u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly | |||
29 | = { [0 ... NR_CPUS-1] = BAD_APICID }; | 29 | = { [0 ... NR_CPUS-1] = BAD_APICID }; |
30 | EXPORT_SYMBOL(x86_cpu_to_apicid); | 30 | EXPORT_SYMBOL(x86_cpu_to_apicid); |
31 | 31 | ||
32 | u8 x86_cpu_to_log_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID }; | ||
33 | |||
34 | struct genapic __read_mostly *genapic = &apic_flat; | 32 | struct genapic __read_mostly *genapic = &apic_flat; |
35 | 33 | ||
36 | /* | 34 | /* |
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c index ecb01eefdd27..91c7526768ee 100644 --- a/arch/x86/kernel/genapic_flat_64.c +++ b/arch/x86/kernel/genapic_flat_64.c | |||
@@ -52,7 +52,6 @@ static void flat_init_apic_ldr(void) | |||
52 | 52 | ||
53 | num = smp_processor_id(); | 53 | num = smp_processor_id(); |
54 | id = 1UL << num; | 54 | id = 1UL << num; |
55 | x86_cpu_to_log_apicid[num] = id; | ||
56 | apic_write(APIC_DFR, APIC_DFR_FLAT); | 55 | apic_write(APIC_DFR, APIC_DFR_FLAT); |
57 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | 56 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; |
58 | val |= SET_APIC_LOGICAL_ID(id); | 57 | val |= SET_APIC_LOGICAL_ID(id); |
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index e5f08de9db88..e351ac4ab5b1 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c | |||
@@ -695,7 +695,6 @@ do_rest: | |||
695 | cpu_clear(cpu, cpu_present_map); | 695 | cpu_clear(cpu, cpu_present_map); |
696 | cpu_clear(cpu, cpu_possible_map); | 696 | cpu_clear(cpu, cpu_possible_map); |
697 | x86_cpu_to_apicid[cpu] = BAD_APICID; | 697 | x86_cpu_to_apicid[cpu] = BAD_APICID; |
698 | x86_cpu_to_log_apicid[cpu] = BAD_APICID; | ||
699 | return -EIO; | 698 | return -EIO; |
700 | } | 699 | } |
701 | 700 | ||
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h index f5bcee1c0927..d30e9b684fdd 100644 --- a/include/asm-x86/smp_64.h +++ b/include/asm-x86/smp_64.h | |||
@@ -85,7 +85,6 @@ static inline int hard_smp_processor_id(void) | |||
85 | * the real APIC ID <-> CPU # mapping. | 85 | * the real APIC ID <-> CPU # mapping. |
86 | */ | 86 | */ |
87 | extern u8 x86_cpu_to_apicid[NR_CPUS]; /* physical ID */ | 87 | extern u8 x86_cpu_to_apicid[NR_CPUS]; /* physical ID */ |
88 | extern u8 x86_cpu_to_log_apicid[NR_CPUS]; | ||
89 | extern u8 bios_cpu_apicid[]; | 88 | extern u8 bios_cpu_apicid[]; |
90 | 89 | ||
91 | static inline int cpu_present_to_apicid(int mps_cpu) | 90 | static inline int cpu_present_to_apicid(int mps_cpu) |