kernel: bump 5.4 to 5.4.191

[openwrt/staging/pepe2k.git] / target / linux / bcm27xx / patches-5.4 / 950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch

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 127d4c51d9b8f9b0865e45506b0f26c836edb8da..4fe3df06db7a2939a4538ac9b3fe76696fb81cb1 100644 (file)
--- 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))