diff options
author | John Crispin <blogic@openwrt.org> | 2015-08-17 11:25:46 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2015-08-17 11:25:46 +0000 |
commit | c06b25618540e8defb5c3d38afe7f4c34d5147a2 (patch) | |
tree | 61c12eedc2abdeafff2a240e14f3cb76eec79f87 /target/linux/oxnas/patches-4.0/999-libata-hacks.patch | |
parent | b93da45e005a9f42d3ecf6843c5ffaa13de5e8e8 (diff) | |
download | master-187ad058-c06b25618540e8defb5c3d38afe7f4c34d5147a2.tar.gz master-187ad058-c06b25618540e8defb5c3d38afe7f4c34d5147a2.tar.bz2 master-187ad058-c06b25618540e8defb5c3d38afe7f4c34d5147a2.zip |
oxnas: remove support for kernel 3.18 and 4.0
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46668 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-4.0/999-libata-hacks.patch')
-rw-r--r-- | target/linux/oxnas/patches-4.0/999-libata-hacks.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/oxnas/patches-4.0/999-libata-hacks.patch b/target/linux/oxnas/patches-4.0/999-libata-hacks.patch deleted file mode 100644 index 504bbdb087..0000000000 --- a/target/linux/oxnas/patches-4.0/999-libata-hacks.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/drivers/ata/libata-core.c -+++ b/drivers/ata/libata-core.c -@@ -1586,6 +1586,14 @@ unsigned ata_exec_internal_sg(struct ata - return AC_ERR_SYSTEM; - } - -+ if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap, 0, 0)) { -+ spin_unlock_irqrestore(ap->lock, flags); -+ if (!ap->ops->acquire_hw(ap, 1, (2*HZ))) { -+ return AC_ERR_TIMEOUT; -+ } -+ spin_lock_irqsave(ap->lock, flags); -+ } -+ - /* initialize internal qc */ - - /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4760,6 +4768,9 @@ struct ata_queued_cmd *ata_qc_new_init(s - if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) - return NULL; - -+ if (ap->ops->qc_new && ap->ops->qc_new(ap)) -+ return NULL; -+ - /* libsas case */ - if (ap->flags & ATA_FLAG_SAS_HOST) { - tag = ata_sas_allocate_tag(ap); -@@ -4805,6 +4816,8 @@ void ata_qc_free(struct ata_queued_cmd * - qc->tag = ATA_TAG_POISON; - if (ap->flags & ATA_FLAG_SAS_HOST) - ata_sas_free_tag(tag, ap); -+ if (ap->ops->qc_free) -+ ap->ops->qc_free(qc); - } - } - ---- a/include/linux/libata.h -+++ b/include/linux/libata.h -@@ -903,6 +903,8 @@ struct ata_port_operations { - void (*qc_prep)(struct ata_queued_cmd *qc); - unsigned int (*qc_issue)(struct ata_queued_cmd *qc); - bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); -+ int (*qc_new)(struct ata_port *ap); -+ void (*qc_free)(struct ata_queued_cmd *qc); - - /* - * Configuration and exception handling -@@ -993,6 +995,9 @@ struct ata_port_operations { - void (*phy_reset)(struct ata_port *ap); - void (*eng_timeout)(struct ata_port *ap); - -+ int (*acquire_hw)(struct ata_port *ap, int may_sleep, -+ int timeout_jiffies); -+ - /* - * ->inherits must be the last field and all the preceding - * fields must be pointers. |