Messages in this thread Patch in this message | | | From | Evgeniy Baskov <> | Subject | [PATCH v5 3/5] x86/setup: Use resolve_cmdline() in setup.c | Date | Mon, 1 Aug 2022 19:34:59 +0300 |
| |
From: Baskov Evgeniy <baskov@ispras.ru>
Use a common helper function for command line resolving in arch/x86/kernel/setup.c for code unification.
Signed-off-by: Baskov Evgeniy <baskov@ispras.ru>
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index bd6c6fd373ae..9c1e943a49c3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -47,6 +47,7 @@ #include <asm/pci-direct.h> #include <asm/prom.h> #include <asm/proto.h> +#include <asm/shared/setup-cmdline.h> #include <asm/thermal.h> #include <asm/unwind.h> #include <asm/vsyscall.h> @@ -159,10 +160,7 @@ unsigned long saved_video_mode; #define RAMDISK_PROMPT_FLAG 0x8000 #define RAMDISK_LOAD_FLAG 0x4000 -static char __initdata command_line[COMMAND_LINE_SIZE]; -#ifdef CONFIG_CMDLINE_BOOL -static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE; -#endif +static char command_line[COMMAND_LINE_SIZE] __initdata = COMMAND_LINE_INIT; #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) struct edd edd; @@ -896,20 +894,8 @@ void __init setup_arch(char **cmdline_p) bss_resource.start = __pa_symbol(__bss_start); bss_resource.end = __pa_symbol(__bss_stop)-1; -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE - strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); -#else - if (builtin_cmdline[0]) { - /* append boot loader cmdline to builtin */ - strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); - strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); - strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); - } -#endif -#endif - - strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); + resolve_cmdline(command_line, boot_command_line); + strscpy(boot_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; /* -- 2.35.1
| |