diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-08-09 20:25:38 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-08-09 23:17:09 +0200 |
| commit | 91d209362b97fc1ff2ab931fe854c99f5a5aae73 (patch) | |
| tree | 778bbfec6ccf416367686e9ec2ed73f45aacf745 /target/linux/oxnas/patches-4.4/999-libata-hacks.patch | |
| parent | b5d9776cd24bc7dfd181c40560af85712a0040f7 (diff) | |
| download | upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.tar.gz upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.tar.bz2 upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.zip | |
kernel: bump kernel 4.4 to version 4.4.147
target/linux/ar71xx/patches-4.4/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch
has been applied upstream; the two deleted brcm2708 patches have been
useless even before (as the second one only reverted the first one).
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'target/linux/oxnas/patches-4.4/999-libata-hacks.patch')
| -rw-r--r-- | target/linux/oxnas/patches-4.4/999-libata-hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch index 83899e6f2b..cd426718db 100644 --- a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4815,6 +4823,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4818,6 +4826,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); -@@ -4860,6 +4871,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4863,6 +4874,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 -@@ -906,6 +906,8 @@ struct ata_port_operations { +@@ -907,6 +907,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 -@@ -996,6 +998,9 @@ struct ata_port_operations { +@@ -997,6 +999,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); |