1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 61203eebf3a1..48eabb6c2d4f 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -712,6 +712,11 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table,
                                           table_length);
 }
 
+#ifdef CONFIG_ACPI_CUSTOM_DSDT
+static void *amlcode __attribute__ ((weakref("AmlCode")));
+static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code")));
+#endif
+
 acpi_status
 acpi_os_table_override(struct acpi_table_header *existing_table,
                        struct acpi_table_header **new_table)
@@ -722,8 +727,11 @@ acpi_os_table_override(struct acpi_table_header *existing_table,
         *new_table = NULL;
 
 #ifdef CONFIG_ACPI_CUSTOM_DSDT
-        if (strncmp(existing_table->signature, "DSDT", 4) == 0)
-                *new_table = (struct acpi_table_header *)AmlCode;
+        if (!strncmp(existing_table->signature, "DSDT", 4)) {
+                *new_table = (struct acpi_table_header *)&amlcode;
+                if (!(*new_table))
+                        *new_table = (struct acpi_table_header *)&dsdt_amlcode;
+        }
 #endif
         if (*new_table != NULL)
                 acpi_table_taint(existing_table);