[kernel] r18518 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Fri Jan 13 03:58:21 2012
New Revision: 18518

Log:
[x86] ACPI: fix corrupt DSDT by enabling acpi=copy_dsdt automatically on more known-bad Toshiba models (Closes: #598104)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/41

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Jan 13 03:01:43 2012	(r18517)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Jan 13 03:58:21 2012	(r18518)
@@ -15,6 +15,10 @@
   [ Ian Campbell ]
   * xen: Set XEN_MAX_DOMAIN_MEMORY to 70G for 64 bit domains. (Closes: #645052)
 
+  [ Jonathan Nieder ]
+  * [x86] ACPI: fix corrupt DSDT by enabling acpi=copy_dsdt automatically on
+    more known-bad Toshiba models (Closes: #598104)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Dec 2011 20:04:56 +0100
 
 linux-2.6 (2.6.32-40) stable; urgency=high

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch	Fri Jan 13 03:58:21 2012	(r18518)
@@ -0,0 +1,51 @@
+From: Len Brown <len.brown at intel.com>
+Date: Tue, 28 Sep 2010 22:57:02 -0400
+Subject: ACPI: invoke DSDT corruption workaround on all Toshiba Satellite
+
+commit 100cf87788c0e9104f6fb1b0ff5f72f73fbbbea3 upstream.
+
+Our list of Toshiba Satellite models that require this workaround
+is growing -- so invoke the workaround for the entire product line.
+
+https://bugzilla.kernel.org/show_bug.cgi?id=14679
+
+Signed-off-by: Len Brown <len.brown at intel.com>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+---
+ drivers/acpi/bus.c |   14 +++-----------
+ 1 files changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
+index 6f81634ac620..2a409996d5d3 100644
+--- a/drivers/acpi/bus.c
++++ b/drivers/acpi/bus.c
+@@ -79,23 +79,15 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
+ 
+ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+ 	/*
+-	 * Insyde BIOS on some TOSHIBA machines corrupt the DSDT.
++	 * Invoke DSDT corruption work-around on all Toshiba Satellite.
+ 	 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
+ 	 */
+ 	{
+ 	 .callback = set_copy_dsdt,
+-	 .ident = "TOSHIBA Satellite A505",
++	 .ident = "TOSHIBA Satellite",
+ 	 .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"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
+ 		},
+ 	},
+ 	{}
+-- 
+1.7.8.rc3
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/41
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/41	Fri Jan 13 03:01:43 2012	(r18517)
+++ dists/squeeze/linux-2.6/debian/patches/series/41	Fri Jan 13 03:58:21 2012	(r18518)
@@ -2,3 +2,4 @@
 + bugfix/all/ipv6-fix-NULL-dereference-in-udp6_ufo_fragment.patch
 + bugfix/all/stable/2.6.32.52.patch
 + bugfix/all/stable/2.6.32.53.patch
++ bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch