Merge remote-tracking branch 'pm/linux-next'

[karo-tx-linux.git] / arch / arm64 / kernel / acpi.c

diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 137d537ddceb8001f15d9daa18c95631b561a085..d1ce8e2f98b99bcb1fba0bae25c08e8f851c4f4b 100644 (file)
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -211,31 +211,6 @@ void __init acpi_boot_table_init(void)
        }
 }
 
-void __init acpi_gic_init(void)
-{
-       struct acpi_table_header *table;
-       acpi_status status;
-       acpi_size tbl_size;
-       int err;
-
-       if (acpi_disabled)
-               return;
-
-       status = acpi_get_table_with_size(ACPI_SIG_MADT, 0, &table, &tbl_size);
-       if (ACPI_FAILURE(status)) {
-               const char *msg = acpi_format_exception(status);
-
-               pr_err("Failed to get MADT table, %s\n", msg);
-               return;
-       }
-
-       err = gic_v2_acpi_init(table);
-       if (err)
-               pr_err("Failed to initialize GIC IRQ controller");
-
-       early_acpi_os_unmap_memory((char *)table, tbl_size);
-}
-
 #ifdef CONFIG_ACPI_APEI
 pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr)
 {