diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-08-09 11:09:52 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-08-09 11:09:52 +0000 |
| commit | 0b8643af4fa7eebd55b63d6d547f85da1409f83d (patch) | |
| tree | 4089a6861f684c95f6702412fc45b7d46a8fb46e /target/linux/oxnas | |
| parent | 3e52c8c35706f9cb7fa9dfb8cd4cbbaebb4d5fc7 (diff) | |
| download | master-31e0f0ae-0b8643af4fa7eebd55b63d6d547f85da1409f83d.tar.gz master-31e0f0ae-0b8643af4fa7eebd55b63d6d547f85da1409f83d.tar.bz2 master-31e0f0ae-0b8643af4fa7eebd55b63d6d547f85da1409f83d.zip | |
kernel: update 3.18 to 3.18.20
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46570
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-3.18/999-libata-hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/oxnas/patches-3.18/999-libata-hacks.patch b/target/linux/oxnas/patches-3.18/999-libata-hacks.patch index 702a336155..b3ff7fa241 100644 --- a/target/linux/oxnas/patches-3.18/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-3.18/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4752,6 +4760,9 @@ static struct ata_queued_cmd *ata_qc_new +@@ -4757,6 +4765,9 @@ static struct ata_queued_cmd *ata_qc_new if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ for (i = 0, tag = ap->last_tag + 1; i < max_queue; i++, tag++) { if (ap->flags & ATA_FLAG_LOWTAG) tag = i; -@@ -4824,6 +4835,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4829,6 +4840,8 @@ void ata_qc_free(struct ata_queued_cmd * if (likely(ata_tag_valid(tag))) { qc->tag = ATA_TAG_POISON; clear_bit(tag, &ap->qc_allocated); @@ -36,7 +36,7 @@ --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -900,6 +900,8 @@ struct ata_port_operations { +@@ -901,6 +901,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 -@@ -990,6 +992,9 @@ struct ata_port_operations { +@@ -991,6 +993,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); |