On 10/09/2009 04:39 AM, Ingo Molnar wrote:
From: Ingo Molnar<mingo@xxxxxxx>
Date: Fri, 9 Oct 2009 10:13:56 +0200
Subject: [PATCH] ahci: Fix "filter FPDMA non-zero offset enable for Aspire 3810T" on !CONFIG_ATA_ACPI
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Commit f80ae7e ("ahci: filter FPDMA non-zero offset enable for Aspire
3810T") introduced a new build breakage:
drivers/ata/ahci.c: In function ‘ahci_gtf_filter_workaround’:
drivers/ata/ahci.c:2927: error: ‘struct ata_device’ has no member named ‘gtf_filter’
make[2]: *** [drivers/ata/ahci.o] Error 1
make[1]: *** [drivers/ata] Error 2
make[1]: *** Waiting for unfinished jobs....
As the acpi taskfile command filter support is a property of
libata-acpi - so the ata_device::gtf_filter field only exists
under CONFIG_ATA_ACPI.
Add the trivial #ifdef to turn ahci_gtf_filter_workaround()
into a NOP on !CONFIG_ATA_ACPI.
Cc: Marcus Meissner<meissner@xxxxxxxxxx>
Cc: Jeff Garzik<jgarzik@xxxxxxxxxx>
Signed-off-by: Ingo Molnar<mingo@xxxxxxx>
---
drivers/ata/ahci.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 4edca6e..fc8d527 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -2886,6 +2886,7 @@ static bool ahci_broken_online(struct pci_dev *pdev)
static void ahci_gtf_filter_workaround(struct ata_host *host)
{
+#ifdef CONFIG_ATA_ACPI
static const struct dmi_system_id sysids[] = {
/*
* Aspire 3810T issues a bunch of SATA enable commands
@@ -2926,6 +2927,7 @@ static void ahci_gtf_filter_workaround(struct ata_host *host)
ata_for_each_dev(dev, link, ALL)
dev->gtf_filter |= filter;
}
+#endif
}
Either way is fine with me. I tend to prefer conditional compilation to
be outside a function, but it's not a big deal. Linus can pull my
submit, or add
Acked-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
to this Ingo patch.
Same end result; whichever makes people happier, and fixes builds the
most rapidly...
Jeff
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
