Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (22 commits)
  ACPI: fix early DSDT dmi check warnings on ia64
  ACPICA: Update version to 20100428.
  ACPICA: Update/clarify some parameter names associated with acpi_handle
  ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep
  ACPICA: Prevent possible allocation overrun during object copy
  ACPICA: Split large file, evgpeblk
  ACPICA: Add GPE support for dynamically loaded ACPI tables
  ACPICA: Clarify/rename some root table descriptor fields
  ACPICA: Update version to 20100331.
  ACPICA: Minimize the differences between linux GPE code and ACPICA code base
  ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT
  ACPICA: Update DSDT copy/detection.
  ACPICA: Add subsystem option to force copy of DSDT to local memory
  ACPICA: Add detection of corrupted/replaced DSDT
  ACPICA: Add write support for DataTable operation regions
  ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy
  ACPICA: Update comments/headers, no functional change
  ACPICA: Update version to 20100304
  ACPICA: Fix for possible fault in acpi_ex_release_mutex
  ACPICA: Standardize integer output for ACPICA warnings/errors
  ...

1 files changed, 44 insertions, 0 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 743576bf1bd7..9042a8579668 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -69,6 +69,44 @@ static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = {
 };
 
 
+#ifdef CONFIG_X86
+static int set_copy_dsdt(const struct dmi_system_id *id)
+{
+        printk(KERN_NOTICE "%s detected - "
+                "force copy of DSDT to local memory\n", id->ident);
+        acpi_gbl_copy_dsdt_locally = 1;
+        return 0;
+}
+
+static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+        /*
+         * Insyde BIOS on some TOSHIBA machines corrupt the DSDT.
+         * https://bugzilla.kernel.org/show_bug.cgi?id=14679
+         */
+        {
+         .callback = set_copy_dsdt,
+         .ident = "TOSHIBA Satellite A505",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A505"),
+                },
+        },
+        {
+         .callback = set_copy_dsdt,
+         .ident = "TOSHIBA Satellite L505D",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"),
+                },
+        },
+        {}
+};
+#else
+static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+        {}
+};
+#endif
+
 /* --------------------------------------------------------------------------
                                 Device Management
    -------------------------------------------------------------------------- */
@@ -813,6 +851,12 @@ void __init acpi_early_init(void)
 
         acpi_gbl_permanent_mmap = 1;
 
+        /*
+         * If the machine falls into the DMI check table,
+         * DSDT will be copied to memory
+         */
+        dmi_check_system(dsdt_dmi_table);
+
         status = acpi_reallocate_root_table();
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX