Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

[platform/kernel/linux-rpi.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 1ecfd43..919f65f 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -94,6 +94,7 @@
 #include <linux/jump_label.h>
 #include <linux/mem_encrypt.h>
 #include <linux/file.h>
+#include <linux/kcsan.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -780,6 +781,7 @@ asmlinkage __visible void __init start_kernel(void)
        acpi_subsystem_init();
        arch_post_acpi_subsys_init();
        sfi_init_late();
+       kcsan_init();
 
        /* Do the rest non-__init'ed, we're now alive */
        arch_call_rest_init();