kernel: bump 5.4 to 5.4.108

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch b/target/linux/bcm27xx/patches-5.4/950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch
index ccb2071f17c414d5f442eb87e85d99f8c2b29f83..92123ceb32fa1972b47a94eafff328accbbf599f 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch
@@ -140,7 +140,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
                }
  #endif
                if (end > max_dma32) {
-@@ -408,9 +430,11 @@ void __init arm64_memblock_init(void)
+@@ -420,9 +442,11 @@ void __init arm64_memblock_init(void)
  
        early_init_fdt_scan_reserved_mem();
  
@@ -154,7 +154,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
        else
                arm64_dma32_phys_limit = PHYS_MASK + 1;
  
-@@ -420,7 +444,7 @@ void __init arm64_memblock_init(void)
+@@ -432,7 +456,7 @@ void __init arm64_memblock_init(void)
  
        high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
  
@@ -163,7 +163,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  }
  
  void __init bootmem_init(void)
-@@ -524,7 +548,7 @@ static void __init free_unused_memmap(vo
+@@ -536,7 +560,7 @@ static void __init free_unused_memmap(vo
  void __init mem_init(void)
  {
        if (swiotlb_force == SWIOTLB_FORCE ||