aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-04 15:16:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-04 21:12:42 +0200
commit68d9cb82143b864d70e4fb3d7cbb7068f82216a1 (patch)
tree937de971cb0239c77a2e533022aba3fd4a8f36ba /target/linux/oxnas
parent6062d858929df927e244280ec4864b35a217d6d1 (diff)
downloadupstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.gz
upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.bz2
upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.zip
kernel: Update kernel 5.4 to version 5.4.50
Run tested: ath79, ipq40xx Build tested: ath79, ipq40xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-5.4/999-libata-hacks.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch
index 7c70a597d0..f846c3fee3 100644
--- a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch
@@ -1,6 +1,6 @@
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -1584,6 +1584,14 @@ unsigned ata_exec_internal_sg(struct ata
+@@ -1583,6 +1583,14 @@ unsigned ata_exec_internal_sg(struct ata
return AC_ERR_SYSTEM;
}
@@ -15,7 +15,7 @@
/* initialize internal qc */
qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL);
-@@ -5123,6 +5131,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5122,6 +5130,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);
-@@ -5168,6 +5179,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -5167,6 +5178,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
-@@ -905,6 +905,8 @@ struct ata_port_operations {
+@@ -908,6 +908,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
-@@ -995,6 +997,9 @@ struct ata_port_operations {
+@@ -998,6 +1000,9 @@ struct ata_port_operations {
void (*phy_reset)(struct ata_port *ap);
void (*eng_timeout)(struct ata_port *ap);