releases/2.6.24.1/acpi-update-acpi-blacklist.patch

   1 From stable-bounces@linux.kernel.org Sun Feb  3 14:44:14 2008
   2 From: Len Brown <lenb@kernel.org>
   3 Date: Sun, 3 Feb 2008 17:43:57 -0500
   4 Subject: ACPI: update ACPI blacklist
   5 To: stable@kernel.org
   6 Message-ID: <200802031743.57309.lenb@kernel.org>
   7 Content-Disposition: inline
   8
   9
  10 From: Len Brown <len.brown@intel.com>
  11
  12 These minor changes sync the latest ACPI blacklist into 2.6.24.
  13 The main benefit of this patch is to make any future
  14 changes easier to apply.  The immediate benefit is one less
  15 dmesg line on Acer systems.
  16
  17 Signed-off-by: Len Brown <len.brown@intel.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19
  20 ---
  21  drivers/acpi/blacklist.c    |   23 ++++++++++++++---------
  22  drivers/acpi/osl.c          |   16 ++++++++--------
  23  drivers/firmware/dmi_scan.c |    9 ---------
  24  include/linux/dmi.h         |    2 --
  25  4 files changed, 22 insertions(+), 28 deletions(-)
  26
  27 --- a/drivers/acpi/blacklist.c
  28 +++ b/drivers/acpi/blacklist.c
  29 @@ -208,24 +208,24 @@ static struct dmi_system_id acpi_osi_dmi
  30          * Disable OSI(Linux) warnings on all "Acer, inc."
  31          *
  32          * _OSI(Linux) disables the latest Windows BIOS code:
  33 +        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3100"),
  34          * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5050"),
  35 +        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
  36          * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5580"),
  37          * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 3010"),
  38          * _OSI(Linux) effect unknown:
  39          * DMI_MATCH(DMI_PRODUCT_NAME, "Ferrari 5000"),
  40          */
  41 -       {
  42 -       .callback = dmi_disable_osi_linux,
  43 -       .ident = "Acer, inc.",
  44 -       .matches = {
  45 -                    DMI_MATCH(DMI_SYS_VENDOR, "Acer, inc."),
  46 -               },
  47 -       },
  48 +       /*
  49 +        * note that dmi_check_system() uses strstr()
  50 +        * to match sub-strings rather than !strcmp(),
  51 +        * so "Acer" below matches "Acer, inc." above.
  52 +        */
  53         /*
  54          * Disable OSI(Linux) warnings on all "Acer"
  55          *
  56          * _OSI(Linux) effect unknown:
  57 -        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
  58 +        * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5315"),
  59          * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
  60          * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720Z"),
  61          * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5520"),
  62 @@ -300,7 +300,7 @@ static struct dmi_system_id acpi_osi_dmi
  63                      DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
  64                 },
  65         },
  66 -       { /* OSI(Linux) touches USB, breaks suspend to disk */
  67 +       { /* OSI(Linux) touches USB, unknown side-effect */
  68         .callback = dmi_disable_osi_linux,
  69         .ident = "Dell Dimension 5150",
  70         .matches = {
  71 @@ -474,6 +474,11 @@ static struct dmi_system_id acpi_osi_dmi
  72          *
  73          * _OSI(Linux) confirmed to be a NOP:
  74          * DMI_MATCH(DMI_PRODUCT_NAME, "P1-J150B"),
  75 +        * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"),
  76 +        *
  77 +        * unknown:
  78 +        * DMI_MATCH(DMI_PRODUCT_NAME, "S1-MDGDG"),
  79 +        * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"),
  80          */
  81         {
  82         .callback = dmi_disable_osi_linux,
  83 --- a/drivers/acpi/osl.c
  84 +++ b/drivers/acpi/osl.c
  85 @@ -120,7 +120,7 @@ static char osi_additional_string[OSI_ST
  86   */
  87  #define OSI_LINUX_ENABLE 0
  88
  89 -struct osi_linux {
  90 +static struct osi_linux {
  91         unsigned int    enable:1;
  92         unsigned int    dmi:1;
  93         unsigned int    cmdline:1;
  94 @@ -1213,24 +1213,24 @@ acpi_status acpi_os_release_object(acpi_
  95   *
  96   *     Returns 0 on success
  97   */
  98 -int acpi_dmi_dump(void)
  99 +static int acpi_dmi_dump(void)
 100  {
 101
 102         if (!dmi_available)
 103                 return -1;
 104
 105         printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n",
 106 -               dmi_get_slot(DMI_SYS_VENDOR));
 107 +               dmi_get_system_info(DMI_SYS_VENDOR));
 108         printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n",
 109 -               dmi_get_slot(DMI_PRODUCT_NAME));
 110 +               dmi_get_system_info(DMI_PRODUCT_NAME));
 111         printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n",
 112 -               dmi_get_slot(DMI_PRODUCT_VERSION));
 113 +               dmi_get_system_info(DMI_PRODUCT_VERSION));
 114         printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n",
 115 -               dmi_get_slot(DMI_BOARD_NAME));
 116 +               dmi_get_system_info(DMI_BOARD_NAME));
 117         printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n",
 118 -               dmi_get_slot(DMI_BIOS_VENDOR));
 119 +               dmi_get_system_info(DMI_BIOS_VENDOR));
 120         printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n",
 121 -               dmi_get_slot(DMI_BIOS_DATE));
 122 +               dmi_get_system_info(DMI_BIOS_DATE));
 123
 124         return 0;
 125  }
 126 --- a/drivers/firmware/dmi_scan.c
 127 +++ b/drivers/firmware/dmi_scan.c
 128 @@ -469,12 +469,3 @@ int dmi_get_year(int field)
 129
 130         return year;
 131  }
 132 -
 133 -/**
 134 - *     dmi_get_slot - return dmi_ident[slot]
 135 - *     @slot:  index into dmi_ident[]
 136 - */
 137 -char *dmi_get_slot(int slot)
 138 -{
 139 -       return(dmi_ident[slot]);
 140 -}
 141 --- a/include/linux/dmi.h
 142 +++ b/include/linux/dmi.h
 143 @@ -79,7 +79,6 @@ extern void dmi_scan_machine(void);
 144  extern int dmi_get_year(int field);
 145  extern int dmi_name_in_vendors(const char *str);
 146  extern int dmi_available;
 147 -extern char *dmi_get_slot(int slot);
 148
 149  #else
 150
 151 @@ -90,7 +89,6 @@ static inline const struct dmi_device *
 152  static inline int dmi_get_year(int year) { return 0; }
 153  static inline int dmi_name_in_vendors(const char *s) { return 0; }
 154  #define dmi_available 0
 155 -static inline char *dmi_get_slot(int slot) { return NULL; }
 156
 157  #endif
 158