kernel: bump 5.4 to 5.4.106

[openwrt/staging/zorun.git] / target / linux / bcm27xx / patches-5.4 / 950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch b/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch
index df184f53eee023b82804e4aa605a8656b851e5bd..18ed0f50ecfde95a8336e638f7908b76658c9b92 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch
@@ -85,7 +85,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
                        zhole_size[ZONE_NORMAL] -= normal_end - normal_start;
                }
        }
-@@ -410,9 +410,9 @@ void __init arm64_memblock_init(void)
+@@ -422,9 +422,9 @@ void __init arm64_memblock_init(void)
  
        /* 4GB maximum for 32-bit only capable devices */
        if (IS_ENABLED(CONFIG_ZONE_DMA32))
@@ -97,7 +97,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  
        reserve_crashkernel();
  
-@@ -420,7 +420,7 @@ void __init arm64_memblock_init(void)
+@@ -432,7 +432,7 @@ void __init arm64_memblock_init(void)
  
        high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
  
@@ -106,7 +106,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  }
  
  void __init bootmem_init(void)
-@@ -524,7 +524,7 @@ static void __init free_unused_memmap(vo
+@@ -536,7 +536,7 @@ static void __init free_unused_memmap(vo
  void __init mem_init(void)
  {
        if (swiotlb_force == SWIOTLB_FORCE ||