[PATCH 01/24] init: initialize ramdisk_execute_command at compile time
From: Christoph Hellwig <hch@lst.de>
Date: 2020-07-20 16:30:06
Also in:
linux-fsdevel, linux-raid, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
Set ramdisk_execute_command to "/init" at compile time. The command line can still override it, but this saves a few instructions and removes a NULL check. Signed-off-by: Christoph Hellwig <hch@lst.de> --- init/main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/init/main.c b/init/main.c
index db0621dfbb0468..c2c9143db96795 100644
--- a/init/main.c
+++ b/init/main.c@@ -154,7 +154,7 @@ static bool initargs_found; #endif static char *execute_command; -static char *ramdisk_execute_command; +static char *ramdisk_execute_command = "/init"; /* * Used to generate warnings if static_key manipulation functions are used
@@ -1514,10 +1514,6 @@ static noinline void __init kernel_init_freeable(void) * check if there is an early userspace init. If yes, let it do all * the work */ - - if (!ramdisk_execute_command) - ramdisk_execute_command = "/init"; - if (ksys_access((const char __user *) ramdisk_execute_command, 0) != 0) { ramdisk_execute_command = NULL;
--
2.27.0