x86: move mp_register_lapic_address to boot.c

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 11 insertions, 21 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 11bd11847b19..057ccf1d5ad4 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -765,6 +765,16 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
  * Parse LAPIC entries in MADT
  * returns 0 on success, < 0 on error
  */
+
+static void __init acpi_register_lapic_address(unsigned long address)
+{
+        mp_lapic_addr = address;
+
+        set_fixmap_nocache(FIX_APIC_BASE, address);
+        if (boot_cpu_physical_apicid == -1U)
+                boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());
+}
+
 static int __init acpi_parse_madt_lapic_entries(void)
 {
         int count;
@@ -786,7 +796,7 @@ static int __init acpi_parse_madt_lapic_entries(void)
                 return count;
         }
 
-        mp_register_lapic_address(acpi_lapic_addr);
+        acpi_register_lapic_address(acpi_lapic_addr);
 
         count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC,
                                       acpi_parse_sapic, MAX_APICS);
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index ebec70a14198..052043ed6499 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -785,18 +785,6 @@ void __init find_smp_config (void)
 
 #ifdef CONFIG_ACPI
 
-void __init mp_register_lapic_address(u64 address)
-{
-        mp_lapic_addr = (unsigned long) address;
-
-        set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
-
-        if (boot_cpu_physical_apicid == -1U)
-                boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());
-
-        Dprintk("Boot CPU = %d\n", boot_cpu_physical_apicid);
-}
-
 #ifdef  CONFIG_X86_IO_APIC
 
 #define MP_ISA_BUS              0
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 03c19a2e6e9e..1c3bf80b3ba6 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -594,14 +594,6 @@ void __init find_smp_config(void)
 
 #ifdef CONFIG_ACPI
 
-void __init mp_register_lapic_address(u64 address)
-{
-        mp_lapic_addr = (unsigned long)address;
-        set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
-        if (boot_cpu_physical_apicid == -1U)
-                boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());
-}
-
 #define MP_ISA_BUS              0
 #define MP_MAX_IOAPIC_PIN       127