Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 63ae904a99a8eb3718f6a57ee515c12f0b60b8dc..85d69dffe8647bf284db0bf51ef75f5b318e9eda 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -797,7 +797,9 @@ static void __init do_pre_smp_initcalls(void)
 static int run_init_process(const char *init_filename)
 {
        argv_init[0] = init_filename;
-       return kernel_execve(init_filename, argv_init, envp_init);
+       return do_execve(init_filename,
+               (const char __user *const __user *)argv_init,
+               (const char __user *const __user *)envp_init);
 }
 
 static void __init kernel_init_freeable(void);
@@ -812,7 +814,6 @@ static int __ref kernel_init(void *unused)
        system_state = SYSTEM_RUNNING;
        numa_default_policy();
 
-       current->signal->flags |= SIGNAL_UNKILLABLE;
        flush_delayed_fput();
 
        if (ramdisk_execute_command) {