aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-01-30 09:37:13 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-01 19:10:43 +0100
commitd33cd383ed64f3b387c8e3111c3c0c663763c0ea (patch)
tree668da81b3039cfad9d3fa7557a8be18ccbe3f3bc /target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch
parent84fa59b5a80f8522239755d75d7ae51855c47fd2 (diff)
downloadupstream-d33cd383ed64f3b387c8e3111c3c0c663763c0ea.tar.gz
upstream-d33cd383ed64f3b387c8e3111c3c0c663763c0ea.tar.bz2
upstream-d33cd383ed64f3b387c8e3111c3c0c663763c0ea.zip
kernel: bump 5.4 to 5.4.94
All modification made by update_kernel.sh in a fresh clone without existing toolchains. Build-tested: bcm27xx/bcm2711, ipq806x/R7800, Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch b/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch
index 654864d52d..0f4f09ee1c 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch
@@ -50,7 +50,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
-@@ -214,15 +214,14 @@ static void __init zone_sizes_init(unsig
+@@ -208,15 +208,14 @@ static void __init zone_sizes_init(unsig
{
struct memblock_region *reg;
unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];
@@ -69,7 +69,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
#endif
#ifdef CONFIG_ZONE_DMA32
max_dma32 = PFN_DOWN(arm64_dma32_phys_limit);
-@@ -236,25 +235,23 @@ static void __init zone_sizes_init(unsig
+@@ -230,25 +229,23 @@ static void __init zone_sizes_init(unsig
unsigned long start = memblock_region_memory_base_pfn(reg);
unsigned long end = memblock_region_memory_end_pfn(reg);