diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-11-01 13:48:26 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-11-01 13:48:26 +0000 |
| commit | 2f99e562e03487b927782fcd0f690346d71c34e1 (patch) | |
| tree | 0e0299593a79411fc54596a60bcc0b05db458703 /target/linux/oxnas/patches-3.18/999-libata-hacks.patch | |
| parent | 0625aaa6f37dcf6a2ffb611245fa9b6477642b78 (diff) | |
| download | upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.gz upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.bz2 upstream-2f99e562e03487b927782fcd0f690346d71c34e1.zip | |
CC: kernel: update kernel 3.18 to version 3.18.23
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23
backport of r47334.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-3.18/999-libata-hacks.patch')
| -rw-r--r-- | target/linux/oxnas/patches-3.18/999-libata-hacks.patch | 4 |
1 files changed, 2 insertions, 2 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 4c29bb06cf..f5ad6ee822 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 -@@ -4794,6 +4802,9 @@ static struct ata_queued_cmd *ata_qc_new +@@ -4796,6 +4804,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; -@@ -4866,6 +4877,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4868,6 +4879,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); |