kernel: bump 5.4 to 5.4.36

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

diff --git a/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch b/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch
index 5de73d37f7da4aa40c444f89dcfba2811bf3511c..c3ae61c993f6c414a46d9b9dc8316a3579b14570 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0450-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch
@@ -175,7 +175,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  
  static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size)
  {
-@@ -69,7 +68,7 @@ static gfp_t __dma_direct_optimal_gfp_ma
+@@ -70,7 +69,7 @@ static gfp_t __dma_direct_optimal_gfp_ma
         * Note that GFP_DMA32 and GFP_DMA are no ops without the corresponding
         * zones.
         */
@@ -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;
-@@ -395,7 +394,7 @@ int dma_direct_supported(struct device *
+@@ -396,7 +395,7 @@ int dma_direct_supported(struct device *
        u64 min_mask;
  
        if (IS_ENABLED(CONFIG_ZONE_DMA))