diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-27 15:41:08 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-28 01:04:35 +0200 |
| commit | d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c (patch) | |
| tree | 0e63ada8a8ad318c076068ae2bb14d530f53604a /target/linux/oxnas/patches-4.14/999-libata-hacks.patch | |
| parent | 86b44028e2123a199d9ff9cfc1585696bed7af53 (diff) | |
| download | upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.tar.gz upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.tar.bz2 upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.zip | |
kernel: Update to version 4.14.199
Compile and runtime tested on lantiq/xrx200 + ath79/generic.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas/patches-4.14/999-libata-hacks.patch')
| -rw-r--r-- | target/linux/oxnas/patches-4.14/999-libata-hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch index bcd1e76c24..0fb79dfaa8 100644 --- a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -5130,6 +5138,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5129,6 +5137,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -5175,6 +5186,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5174,6 +5185,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); @@ -36,7 +36,7 @@ --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -922,6 +922,8 @@ struct ata_port_operations { +@@ -923,6 +923,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); @@ -45,7 +45,7 @@ /* * Configuration and exception handling -@@ -1012,6 +1014,9 @@ struct ata_port_operations { +@@ -1013,6 +1015,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); |