ACPI: update ACPI blacklist

These minor changes sync the latest ACPI blacklist into 2.6.24.
The main benefit of this patch is to make any future
changes easier to apply.  The immediate benefit is one less
dmesg line on Acer systems.

Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 8809654d6cc965e292b2424f5f85cdecca15c1a2..bd12c8e02c5f7c61e70ec621925b44c228815e6c 100644 (file)
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -208,24 +208,24 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
         * Disable OSI(Linux) warnings on all "Acer, inc."
         *
         * _OSI(Linux) disables the latest Windows BIOS code:
+        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3100"),
         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5050"),
+        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5580"),
         * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 3010"),
         * _OSI(Linux) effect unknown:
         * DMI_MATCH(DMI_PRODUCT_NAME, "Ferrari 5000"),
         */
-       {
-       .callback = dmi_disable_osi_linux,
-       .ident = "Acer, inc.",
-       .matches = {
-                    DMI_MATCH(DMI_SYS_VENDOR, "Acer, inc."),
-               },
-       },
+       /*
+        * note that dmi_check_system() uses strstr()
+        * to match sub-strings rather than !strcmp(),
+        * so "Acer" below matches "Acer, inc." above.
+        */
        /*
         * Disable OSI(Linux) warnings on all "Acer"
         *
         * _OSI(Linux) effect unknown:
-        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
+        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5315"),
         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720Z"),
         * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5520"),
@@ -300,7 +300,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                     DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
                },
        },
-       { /* OSI(Linux) touches USB, breaks suspend to disk */
+       { /* OSI(Linux) touches USB, unknown side-effect */
        .callback = dmi_disable_osi_linux,
        .ident = "Dell Dimension 5150",
        .matches = {
@@ -474,6 +474,11 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
         *
         * _OSI(Linux) confirmed to be a NOP:
         * DMI_MATCH(DMI_PRODUCT_NAME, "P1-J150B"),
+        * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"),
+        *
+        * unknown:
+        * DMI_MATCH(DMI_PRODUCT_NAME, "S1-MDGDG"),
+        * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"),
         */
        {
        .callback = dmi_disable_osi_linux,

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index e53fb516f9d45538dbfdedc002ad3dcb753e200e..fde7ac82d6112948976e1977d0df447805afef8a 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -120,7 +120,7 @@ static char osi_additional_string[OSI_STRING_LENGTH_MAX];
  */
 #define OSI_LINUX_ENABLE 0
 
-struct osi_linux {
+static struct osi_linux {
        unsigned int    enable:1;
        unsigned int    dmi:1;
        unsigned int    cmdline:1;
@@ -1213,24 +1213,24 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
  *
  *     Returns 0 on success
  */
-int acpi_dmi_dump(void)
+static int acpi_dmi_dump(void)
 {
 
        if (!dmi_available)
                return -1;
 
        printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n",
-               dmi_get_slot(DMI_SYS_VENDOR));
+               dmi_get_system_info(DMI_SYS_VENDOR));
        printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n",
-               dmi_get_slot(DMI_PRODUCT_NAME));
+               dmi_get_system_info(DMI_PRODUCT_NAME));
        printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n",
-               dmi_get_slot(DMI_PRODUCT_VERSION));
+               dmi_get_system_info(DMI_PRODUCT_VERSION));
        printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n",
-               dmi_get_slot(DMI_BOARD_NAME));
+               dmi_get_system_info(DMI_BOARD_NAME));
        printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n",
-               dmi_get_slot(DMI_BIOS_VENDOR));
+               dmi_get_system_info(DMI_BIOS_VENDOR));
        printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n",
-               dmi_get_slot(DMI_BIOS_DATE));
+               dmi_get_system_info(DMI_BIOS_DATE));
 
        return 0;
 }

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 5e596a7e36013dc2d24082726a0eab5b792fc354..b2fb6ba39dc82aa60ca17c32f5da56684b42854b 100644 (file)
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -469,12 +469,3 @@ int dmi_get_year(int field)
 
        return year;
 }
-
-/**
- *     dmi_get_slot - return dmi_ident[slot]
- *     @slot:  index into dmi_ident[]
- */
-char *dmi_get_slot(int slot)
-{
-       return(dmi_ident[slot]);
-}

diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index 5b42a659a308d046a886ca86fd05e260822a77b4..b1251b2af568b6d2c7c3063b7d4f57a071c79c1e 100644 (file)
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -79,7 +79,6 @@ extern void dmi_scan_machine(void);
 extern int dmi_get_year(int field);
 extern int dmi_name_in_vendors(const char *str);
 extern int dmi_available;
-extern char *dmi_get_slot(int slot);
 
 #else
 
@@ -90,7 +89,6 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na
 static inline int dmi_get_year(int year) { return 0; }
 static inline int dmi_name_in_vendors(const char *s) { return 0; }
 #define dmi_available 0
-static inline char *dmi_get_slot(int slot) { return NULL; }
 
 #endif