Merge patch series "riscv: Introduce KASLR"

[platform/kernel/linux-rpi.git] / arch / riscv / kernel / setup.c

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 0fb5a26..e600aab 100644 (file)
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -179,6 +179,11 @@ static void __init init_resources(void)
                if (ret < 0)
                        goto error;
        }
+       if (crashk_low_res.start != crashk_low_res.end) {
+               ret = add_resource(&iomem_resource, &crashk_low_res);
+               if (ret < 0)
+                       goto error;
+       }
 #endif
 
 #ifdef CONFIG_CRASH_DUMP
@@ -312,6 +317,7 @@ void __init setup_arch(char **cmdline_p)
        if (IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM) &&
            riscv_isa_extension_available(NULL, ZICBOM))
                riscv_noncoherent_supported();
+       riscv_set_dma_cache_alignment();
 }
 
 static int __init topology_init(void)