From 2328977fed81cf2fc367d8eea2f9bf04e51a761f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 30 May 2018 21:39:51 +0200 Subject: kernel: bump kernel 4.4 to 4.4.135 for 17.01 * Refreshed patches Signed-off-by: Hauke Mehrtens --- .../011-dmaengine-core-Introduce-new-universal-API-to-reques.patch | 6 +++--- .../012-dmaengine-Add-transfer-termination-synchronization-s.patch | 4 ++-- ...0-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/apm821xx') diff --git a/target/linux/apm821xx/patches-4.4/011-dmaengine-core-Introduce-new-universal-API-to-reques.patch b/target/linux/apm821xx/patches-4.4/011-dmaengine-core-Introduce-new-universal-API-to-reques.patch index 7a0e26f..ca58c31 100644 --- a/target/linux/apm821xx/patches-4.4/011-dmaengine-core-Introduce-new-universal-API-to-reques.patch +++ b/target/linux/apm821xx/patches-4.4/011-dmaengine-core-Introduce-new-universal-API-to-reques.patch @@ -283,7 +283,7 @@ Signed-off-by: Vinod Koul dma_cap_mask_t cap_mask; unsigned short max_xor; unsigned short max_pq; -@@ -1140,9 +1168,11 @@ enum dma_status dma_wait_for_async_tx(st +@@ -1158,9 +1186,11 @@ enum dma_status dma_wait_for_async_tx(st void dma_issue_pending_all(void); struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); @@ -297,7 +297,7 @@ Signed-off-by: Vinod Koul void dma_release_channel(struct dma_chan *chan); int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps); #else -@@ -1166,16 +1196,21 @@ static inline struct dma_chan *__dma_req +@@ -1184,16 +1214,21 @@ static inline struct dma_chan *__dma_req { return NULL; } @@ -324,7 +324,7 @@ Signed-off-by: Vinod Koul static inline void dma_release_channel(struct dma_chan *chan) { } -@@ -1186,6 +1221,8 @@ static inline int dma_get_slave_caps(str +@@ -1204,6 +1239,8 @@ static inline int dma_get_slave_caps(str } #endif diff --git a/target/linux/apm821xx/patches-4.4/012-dmaengine-Add-transfer-termination-synchronization-s.patch b/target/linux/apm821xx/patches-4.4/012-dmaengine-Add-transfer-termination-synchronization-s.patch index 21efb04..e5df425 100644 --- a/target/linux/apm821xx/patches-4.4/012-dmaengine-Add-transfer-termination-synchronization-s.patch +++ b/target/linux/apm821xx/patches-4.4/012-dmaengine-Add-transfer-termination-synchronization-s.patch @@ -179,7 +179,7 @@ Signed-off-by: Vinod Koul enum dma_status (*device_tx_status)(struct dma_chan *chan, dma_cookie_t cookie, -@@ -856,6 +859,13 @@ static inline struct dma_async_tx_descri +@@ -874,6 +877,13 @@ static inline struct dma_async_tx_descri src_sg, src_nents, flags); } @@ -193,7 +193,7 @@ Signed-off-by: Vinod Koul static inline int dmaengine_terminate_all(struct dma_chan *chan) { if (chan->device->device_terminate_all) -@@ -864,6 +874,86 @@ static inline int dmaengine_terminate_al +@@ -882,6 +892,86 @@ static inline int dmaengine_terminate_al return -ENOSYS; } diff --git a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch index c753342..d5eda62 100644 --- a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch +++ b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch @@ -47,7 +47,7 @@ Signed-off-by: Jacek Anaszewski #include #include -@@ -4939,6 +4940,9 @@ void ata_qc_complete(struct ata_queued_c +@@ -4945,6 +4946,9 @@ void ata_qc_complete(struct ata_queued_c { struct ata_port *ap = qc->ap; -- cgit v1.1