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-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.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-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch b/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch index 127d4c51d9..4fe3df06db 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch @@ -65,7 +65,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> arm64_dma32_phys_limit = max_zone_phys(32); --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h -@@ -334,13 +334,4 @@ struct vm_area_struct; +@@ -338,13 +338,4 @@ struct vm_area_struct; #endif /* __ASSEMBLY__ */ #include <asm/slice.h> @@ -184,7 +184,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> return GFP_DMA; if (*phys_mask <= DMA_BIT_MASK(32)) return GFP_DMA32; -@@ -396,7 +395,7 @@ int dma_direct_supported(struct device * +@@ -397,7 +396,7 @@ int dma_direct_supported(struct device * u64 min_mask; if (IS_ENABLED(CONFIG_ZONE_DMA)) |