aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/bugfix/hp-laptop-acpi-blacklist.patch24
-rw-r--r--debian/patches/series/111
3 files changed, 33 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1244845055f5..de50138fb46e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,14 @@ linux-2.6 (2.6.18.dfsg.1-11) UNRELEASED; urgency=low
* Add 2.6.18.7, thanks gregkh:
- Fix a free-wrong-pointer bug in nfs/acl server (CVE-2007-0772)
- -- maximilian attems <maks@sternwelten.at> Tue, 20 Feb 2007 11:41:20 +0100
+ [ Steve Langasek ]
+ * debian/patches/bugfix/hp-laptop-acpi-blacklist.patch: ACPI-blacklist
+ certain HP laptop models (nx6125, nx6325, nc6120, and related) that
+ are known to be incompatible with the ACPI implementation in 2.6.18,
+ to prevent problems with memory leaks and heat stress at the expense
+ of battery control and S3 suspend support. Closes: #400488, #404143.
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 20 Feb 2007 15:26:59 -0800
linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low
diff --git a/debian/patches/bugfix/hp-laptop-acpi-blacklist.patch b/debian/patches/bugfix/hp-laptop-acpi-blacklist.patch
new file mode 100644
index 000000000000..4c283240ca3f
--- /dev/null
+++ b/debian/patches/bugfix/hp-laptop-acpi-blacklist.patch
@@ -0,0 +1,24 @@
+Steve Langasek <vorlon@debian.org>
+
+Add to the blacklist certain HP laptop ACPI implementations that are
+known to have problems under 2.6.18. This patch is obsolete in 2.6.19
+and above, where the kernel ACPI implementation has been fixed to handle
+the oddities of these laptops.
+
+Closes: #400488, #404143.
+
+--- linux-2.6.orig/drivers/acpi/blacklist.c 2007-02-17 22:02:12.000000000 -0800
++++ linux-2.6/drivers/acpi/blacklist.c 2007-02-18 20:26:21.000000000 -0800
+@@ -69,6 +69,12 @@
+ "Incorrect _ADR", 1},
+ {"ASUS\0\0", "P2B-S ", 0, ACPI_DSDT, all_versions,
+ "Bogus PCI routing", 1},
++ /* HP nx6125, nx6325 */
++ {"HP ", "SB400\0\0\0", 0x10000, ACPI_DSDT, all_versions,
++ "Bogus fan support", 1},
++ /* HP nc6120 */
++ {"HP ", "DAU00 \0\0", 0x10000, ACPI_DSDT, all_versions,
++ "Bogus fan support", 1},
+
+ {""}
+ };
diff --git a/debian/patches/series/11 b/debian/patches/series/11
index 9dd689f66ebd..4b7c56429568 100644
--- a/debian/patches/series/11
+++ b/debian/patches/series/11
@@ -6,3 +6,4 @@
+ bugfix/ib-mad-fix-race-between-cancel-and-receive-completion.patch
+ bugfix/sparc/sbus-envctrl-remove-execve.patch
+ bugfix/nfs-acl-free-wrong-pointer.patch
++ bugfix/hp-laptop-acpi-blacklist.patch