aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/acpi/boot.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 12e260e8fb2a..d9770a56511a 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -239,10 +239,8 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled)
239 return; 239 return;
240 } 240 }
241 241
242#ifdef CONFIG_X86_32
243 if (boot_cpu_physical_apicid != -1U) 242 if (boot_cpu_physical_apicid != -1U)
244 ver = apic_version[boot_cpu_physical_apicid]; 243 ver = apic_version[boot_cpu_physical_apicid];
245#endif
246 244
247 generic_processor_info(id, ver); 245 generic_processor_info(id, ver);
248} 246}
@@ -762,10 +760,8 @@ static void __init acpi_register_lapic_address(unsigned long address)
762 set_fixmap_nocache(FIX_APIC_BASE, address); 760 set_fixmap_nocache(FIX_APIC_BASE, address);
763 if (boot_cpu_physical_apicid == -1U) { 761 if (boot_cpu_physical_apicid == -1U) {
764 boot_cpu_physical_apicid = read_apic_id(); 762 boot_cpu_physical_apicid = read_apic_id();
765#ifdef CONFIG_X86_32
766 apic_version[boot_cpu_physical_apicid] = 763 apic_version[boot_cpu_physical_apicid] =
767 GET_APIC_VERSION(apic_read(APIC_LVR)); 764 GET_APIC_VERSION(apic_read(APIC_LVR));
768#endif
769 } 765 }
770} 766}
771 767