aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.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-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.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-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch b/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch
index 137a2fa4a0..e1a340ec91 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch
@@ -24,7 +24,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
-@@ -91,7 +91,7 @@ static void __init reserve_crashkernel(v
+@@ -85,7 +85,7 @@ static void __init reserve_crashkernel(v
if (crash_base == 0) {
/* Current arm64 boot protocol requires 2MB alignment */
@@ -33,7 +33,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
crash_size, SZ_2M);
if (crash_base == 0) {
pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
-@@ -459,7 +459,7 @@ void __init arm64_memblock_init(void)
+@@ -449,7 +449,7 @@ void __init arm64_memblock_init(void)
high_memory = __va(memblock_end_of_DRAM() - 1) + 1;