aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe JAILLET <[email protected]>2023-01-14 18:21:38 +0100
committerAndrew Morton <[email protected]>2023-02-02 22:50:05 -0800
commitf3296f80c8065b26a27eb8ab686d0c1d67880524 (patch)
tree0caf34ed92ee43597f627d3a0ef5393a3f7e4a02
parenta42aaad2e47b23d63037bfc0130e33fc0f74cd71 (diff)
initramfs: use kstrtobool() instead of strtobool()
strtobool() is the same as kstrtobool(). However, the latter is more used within the kernel. In order to remove strtobool() and slightly simplify kstrtox.h, switch to the other function name. While at it, include the corresponding header file (<linux/kstrtox.h>) Link: https://lkml.kernel.org/r/2597e80cb7059ec6ad63a01b77d7c944dcc99195.1673716768.git.christophe.jaillet@wanadoo.fr Signed-off-by: Christophe JAILLET <[email protected]> Cc: Christian Brauner <[email protected]> Cc: David Disseldorp <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Martin Wilck <[email protected]> Cc: wuchi <[email protected]> Cc: XU pengfei <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
-rw-r--r--init/initramfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index 62321883fe61..f6c112e30bd4 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -11,6 +11,7 @@
#include <linux/syscalls.h>
#include <linux/utime.h>
#include <linux/file.h>
+#include <linux/kstrtox.h>
#include <linux/memblock.h>
#include <linux/mm.h>
#include <linux/namei.h>
@@ -571,8 +572,7 @@ __setup("keepinitrd", keepinitrd_setup);
static bool __initdata initramfs_async = true;
static int __init initramfs_async_setup(char *str)
{
- strtobool(str, &initramfs_async);
- return 1;
+ return kstrtobool(str, &initramfs_async) == 0;
}
__setup("initramfs_async=", initramfs_async_setup);