aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-11-06 18:43:08 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-07 19:49:50 +0100
commit662fe6a6eeede98ef215284aeb5ff8256ee25f1d (patch)
tree9fcc62ee99d8756917bd291f43f2e7f5fb830d3f /target/linux/generic/pending-4.14/834-ledtrig-libata.patch
parent5e8b9624f1791d193e8d5e007ce4c873454f014a (diff)
downloadupstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.tar.gz
upstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.tar.bz2
upstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.zip
kernel: bump 4.14 to 4.14.254
All updated automatically. Compile-tested on: malta/le, lantiq/xrx200 Runtime-tested on: malta/le, lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14/834-ledtrig-libata.patch')
-rw-r--r--target/linux/generic/pending-4.14/834-ledtrig-libata.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-4.14/834-ledtrig-libata.patch b/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
index b025785ae1..4de54e0a8b 100644
--- a/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
+++ b/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
@@ -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
-@@ -5129,6 +5142,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5157,6 +5170,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;
-@@ -6032,6 +6048,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -6060,6 +6076,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;
-@@ -6053,6 +6072,12 @@ static void ata_host_release(struct devi
+@@ -6081,6 +6100,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;
}
-@@ -6499,7 +6524,23 @@ int ata_host_register(struct ata_host *h
+@@ -6527,7 +6552,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;
}
@@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
-@@ -895,6 +898,12 @@ struct ata_port {
+@@ -896,6 +899,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif