|
@@ -45,7 +45,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
depends on ACPI
|
|
|
--- a/drivers/ata/libata-core.c
|
|
|
+++ b/drivers/ata/libata-core.c
|
|
|
-@@ -731,6 +731,19 @@ u64 ata_tf_read_block(const struct ata_t
|
|
|
+@@ -730,6 +730,19 @@ u64 ata_tf_read_block(const struct ata_t
|
|
|
return block;
|
|
|
}
|
|
|
|
|
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
/**
|
|
|
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
|
|
* @tf: Target ATA taskfile
|
|
|
-@@ -5124,6 +5137,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
|
|
+@@ -5123,6 +5136,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
|
|
if (tag < 0)
|
|
|
return NULL;
|
|
|
}
|
|
@@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
|
|
qc = __ata_qc_from_tag(ap, tag);
|
|
|
qc->tag = tag;
|
|
|
-@@ -6025,6 +6041,9 @@ struct ata_port *ata_port_alloc(struct a
|
|
|
+@@ -6024,6 +6040,9 @@ struct ata_port *ata_port_alloc(struct a
|
|
|
ap->stats.unhandled_irq = 1;
|
|
|
ap->stats.idle_irq = 1;
|
|
|
#endif
|
|
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
ata_sff_port_init(ap);
|
|
|
|
|
|
return ap;
|
|
|
-@@ -6046,6 +6065,12 @@ static void ata_host_release(struct devi
|
|
|
+@@ -6045,6 +6064,12 @@ static void ata_host_release(struct devi
|
|
|
|
|
|
kfree(ap->pmp_link);
|
|
|
kfree(ap->slave_link);
|
|
@@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
kfree(ap);
|
|
|
host->ports[i] = NULL;
|
|
|
}
|
|
|
-@@ -6492,7 +6517,23 @@ int ata_host_register(struct ata_host *h
|
|
|
+@@ -6491,7 +6516,23 @@ int ata_host_register(struct ata_host *h
|
|
|
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
|
|
host->ports[i]->local_port_no = i + 1;
|
|
|
}
|
|
@@ -124,17 +124,17 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
rc = ata_tport_add(host->dev,host->ports[i]);
|
|
|
--- a/include/linux/libata.h
|
|
|
+++ b/include/linux/libata.h
|
|
|
-@@ -38,6 +38,9 @@
|
|
|
- #include <linux/acpi.h>
|
|
|
+@@ -39,6 +39,9 @@
|
|
|
#include <linux/cdrom.h>
|
|
|
#include <linux/sched.h>
|
|
|
+ #include <linux/async.h>
|
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
|
+#include <linux/leds.h>
|
|
|
+#endif
|
|
|
|
|
|
/*
|
|
|
* Define if arch has non-standard setup. This is a _PCI_ standard
|
|
|
-@@ -890,6 +893,12 @@ struct ata_port {
|
|
|
+@@ -893,6 +896,12 @@ struct ata_port {
|
|
|
#ifdef CONFIG_ATA_ACPI
|
|
|
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
|
|
|
#endif
|