summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PATCHCFG5
-rw-r--r--patches/libata-eh-2.6.38.patch20
2 files changed, 24 insertions, 1 deletions
diff --git a/PATCHCFG b/PATCHCFG
index e2f3a22..acdea2d 100644
--- a/PATCHCFG
+++ b/PATCHCFG
@@ -27,6 +27,9 @@ PATCHES=(
i915-pipeline.patch%1
# fix ips module
intel_ips-produces-constant-load-of-1.patch%1
+ # fix https://bugs.archlinux.org/task/24102
+ # libata regression
+ libata-eh-2.6.38.patch%1
# add aufs2 support, in reference to:
# http://aufs.sourceforge.net
@@ -34,7 +37,7 @@ PATCHES=(
aufs2-standalone-20110314.patch%1
)
# Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.38.6-1-ARCH"
+PATCHNAME="patch-2.6.38.6-2-ARCH"
# Run this before applying patches
pre_apply() {
diff --git a/patches/libata-eh-2.6.38.patch b/patches/libata-eh-2.6.38.patch
new file mode 100644
index 0000000..7f97284
--- /dev/null
+++ b/patches/libata-eh-2.6.38.patch
@@ -0,0 +1,20 @@
+diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
+index f26f2fe..dad9fd6 100644
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -3316,7 +3316,7 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy,
+ struct ata_eh_context *ehc = &link->eh_context;
+ struct ata_device *dev, *link_dev = NULL, *lpm_dev = NULL;
+ enum ata_lpm_policy old_policy = link->lpm_policy;
+- bool no_dipm = ap->flags & ATA_FLAG_NO_DIPM;
++ bool no_dipm = link->ap->flags & ATA_FLAG_NO_DIPM;
+ unsigned int hints = ATA_LPM_EMPTY | ATA_LPM_HIPM;
+ unsigned int err_mask;
+ int rc;
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at http://www.tux.org/lkml/
+
+ \ No newline at end of file