VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2020-08-04 14:27:25 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-08-04 14:27:25 -0700 commit: 3950e975431bc914f7e81b8f2a2dbdf2064acb0f parent: fd76a74d940ae3d6b8b2395cd12914630c7e1739

Commit Summary:

Merge branch 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Diffstat:

1 file changed, 1 insertion, 3 deletions

diff --git a/init/main.c b/init/main.c
index 9127b240fd26..15bd0efff3df 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1331,9 +1331,7 @@ static int run_init_process(const char *init_filename)
 	pr_debug("  with environment:\n");
 	for (p = envp_init; *p; p++)
 		pr_debug("    %s\n", *p);
-	return do_execve(getname_kernel(init_filename),
-		(const char __user *const __user *)argv_init,
-		(const char __user *const __user *)envp_init);
+	return kernel_execve(init_filename, argv_init, envp_init);
 }
 
 static int try_to_run_init_process(const char *init_filename)