From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org
Subject: [PATCH 05/21] init: initialize ramdisk_execute_command at compile time
Date: Sun, 26 Jul 2020 09:13:40 +0200 [thread overview]
Message-ID: <20200726071356.287160-6-hch@lst.de> (raw)
In-Reply-To: <20200726071356.287160-1-hch@lst.de>
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
next prev parent reply other threads:[~2020-07-26 7:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-26 7:13 add file system helpers that take kernel pointers for the init code v3 Christoph Hellwig
2020-07-26 7:13 ` [PATCH 01/21] fs: refactor do_mount Christoph Hellwig
2020-07-26 7:13 ` [PATCH 02/21] fs: refactor ksys_umount Christoph Hellwig
2020-07-26 7:13 ` [PATCH 03/21] fs: push the getname from do_rmdir into the callers Christoph Hellwig
2020-07-26 7:13 ` [PATCH 04/21] devtmpfs: refactor devtmpfsd() Christoph Hellwig
2020-07-26 7:43 ` Greg Kroah-Hartman
2020-07-26 8:21 ` Christoph Hellwig
2020-07-26 7:13 ` Christoph Hellwig [this message]
2020-07-26 7:13 ` [PATCH 06/21] init: mark create_dev as __init Christoph Hellwig
2020-07-26 7:13 ` [PATCH 07/21] init: add an init_mount helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 08/21] init: add an init_umount helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 09/21] init: add an init_unlink helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 10/21] init: add an init_rmdir helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 11/21] init: add an init_chdir helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 12/21] init: add an init_chroot helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 13/21] init: add an init_chown helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 14/21] init: add an init_chmod helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 15/21] init: add an init_eaccess helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 16/21] init: add an init_link helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 17/21] init: add an init_symlink helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 18/21] init: add an init_mkdir helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 19/21] init: add an init_mknod helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 20/21] init: add an init_stat helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 21/21] init: add an init_utimes helper Christoph Hellwig
2020-07-26 15:49 ` add file system helpers that take kernel pointers for the init code v3 Linus Torvalds
2020-07-26 15:52 ` Christoph Hellwig
2020-07-26 16:21 ` Al Viro
2020-07-26 16:24 ` Christoph Hellwig
2020-07-26 16:26 ` Christoph Hellwig
2020-07-26 16:33 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200726071356.287160-6-hch@lst.de \
--to=hch@lst.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).