diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-09 18:18:20 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-18 00:10:34 +0200 |
commit | e0bdf839722659ded1ce2f827f04ec4d9be3c6fc (patch) | |
tree | da9d261db6cbc5d4a5fac5d93da6978880807b2c /target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch | |
parent | b4ea8e1089b6db4367d9bd40654d7b16590ae19f (diff) | |
download | upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.gz upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.bz2 upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.zip |
kernel: bump 5.4 to 5.4.191
Merged upstream:
apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch
Similar patch merged upstream:
bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch
Manually adapted:
layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch
Compile-tested: armvirt/64
Run-tested: armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch b/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch index 2534b71b73..de53f028ff 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0444-dma-direct-exclude-dma_direct_map_resource-from-the-.patch @@ -84,7 +84,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c -@@ -326,7 +326,7 @@ static inline bool dma_direct_possible(s +@@ -327,7 +327,7 @@ static inline bool dma_direct_possible(s size_t size) { return swiotlb_force != SWIOTLB_FORCE && @@ -93,7 +93,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> } dma_addr_t dma_direct_map_page(struct device *dev, struct page *page, -@@ -375,7 +375,7 @@ dma_addr_t dma_direct_map_resource(struc +@@ -376,7 +376,7 @@ dma_addr_t dma_direct_map_resource(struc { dma_addr_t dma_addr = paddr; @@ -104,7 +104,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> } --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c -@@ -682,7 +682,7 @@ bool swiotlb_map(struct device *dev, phy +@@ -683,7 +683,7 @@ bool swiotlb_map(struct device *dev, phy /* Ensure that the address returned is DMA'ble */ *dma_addr = __phys_to_dma(dev, *phys); |