vc: introduce struct vc_draw_region

[linux-2.6-microblaze.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index df32f67..0ead83e 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -95,6 +95,7 @@
 #include <linux/rodata_test.h>
 #include <linux/jump_label.h>
 #include <linux/mem_encrypt.h>
+#include <linux/kcsan.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -1036,6 +1037,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();
@@ -1412,6 +1414,8 @@ static int __ref kernel_init(void *unused)
 
        rcu_end_inkernel_boot();
 
+       do_sysctl_args();
+
        if (ramdisk_execute_command) {
                ret = run_init_process(ramdisk_execute_command);
                if (!ret)
@@ -1433,6 +1437,16 @@ static int __ref kernel_init(void *unused)
                panic("Requested init %s failed (error %d).",
                      execute_command, ret);
        }
+
+       if (CONFIG_DEFAULT_INIT[0] != '\0') {
+               ret = run_init_process(CONFIG_DEFAULT_INIT);
+               if (ret)
+                       pr_err("Default init %s failed (error %d)\n",
+                              CONFIG_DEFAULT_INIT, ret);
+               else
+                       return 0;
+       }
+
        if (!try_to_run_init_process("/sbin/init") ||
            !try_to_run_init_process("/etc/init") ||
            !try_to_run_init_process("/bin/init") ||