aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/boot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r--arch/x86/kernel/acpi/boot.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 71232b941b6c..b3cf01ab0630 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -847,18 +847,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
847 * returns 0 on success, < 0 on error 847 * returns 0 on success, < 0 on error
848 */ 848 */
849 849
850static void __init acpi_register_lapic_address(unsigned long address)
851{
852 mp_lapic_addr = address;
853
854 set_fixmap_nocache(FIX_APIC_BASE, address);
855 if (boot_cpu_physical_apicid == -1U) {
856 boot_cpu_physical_apicid = read_apic_id();
857 apic_version[boot_cpu_physical_apicid] =
858 GET_APIC_VERSION(apic_read(APIC_LVR));
859 }
860}
861
862static int __init early_acpi_parse_madt_lapic_addr_ovr(void) 850static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
863{ 851{
864 int count; 852 int count;
@@ -880,7 +868,7 @@ static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
880 return count; 868 return count;
881 } 869 }
882 870
883 acpi_register_lapic_address(acpi_lapic_addr); 871 register_lapic_address(acpi_lapic_addr);
884 872
885 return count; 873 return count;
886} 874}
@@ -907,7 +895,7 @@ static int __init acpi_parse_madt_lapic_entries(void)
907 return count; 895 return count;
908 } 896 }
909 897
910 acpi_register_lapic_address(acpi_lapic_addr); 898 register_lapic_address(acpi_lapic_addr);
911 899
912 count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC, 900 count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC,
913 acpi_parse_sapic, MAX_APICS); 901 acpi_parse_sapic, MAX_APICS);