Merge tag 'trace-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

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

diff --git a/init/main.c b/init/main.c
index 6f6e6fc6f4b9eb5a3e6bebfe9486e8536755f56b..d499f4a80e0ba1d599a941e726dc069cdf128bfe 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -1051,7 +1051,7 @@ static int __ref kernel_init(void *unused)
        /* need to finish all async __init code before freeing the memory */
        async_synchronize_full();
        ftrace_free_init_mem();
-       jump_label_invalidate_init();
+       jump_label_invalidate_initmem();
        free_initmem();
        mark_readonly();
        system_state = SYSTEM_RUNNING;
@@ -1124,11 +1124,11 @@ static noinline void __init kernel_init_freeable(void)
        do_basic_setup();
 
        /* Open the /dev/console on the rootfs, this should never fail */
-       if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+       if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
                pr_err("Warning: unable to open an initial console.\n");
 
-       (void) sys_dup(0);
-       (void) sys_dup(0);
+       (void) ksys_dup(0);
+       (void) ksys_dup(0);
        /*
         * check if there is an early userspace init.  If yes, let it do all
         * the work
@@ -1137,7 +1137,8 @@ static noinline void __init kernel_init_freeable(void)
        if (!ramdisk_execute_command)
                ramdisk_execute_command = "/init";
 
-       if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+       if (ksys_access((const char __user *)
+                       ramdisk_execute_command, 0) != 0) {
                ramdisk_execute_command = NULL;
                prepare_namespace();
        }