* [PATCH v2] init: Use ARRAY_SIZE() in unknown_bootoption()
@ 2026-11-18 11:40 Thorsten Blum
0 siblings, 0 replies; only message in thread
From: Thorsten Blum @ 2026-11-18 11:40 UTC (permalink / raw)
To: Andrew Morton, Masami Hiramatsu (Google), Thorsten Blum,
Breno Leitao, Sang-Heon Jeon, Christian Brauner, Ryan Roberts
Cc: Mike Rapoport (Microsoft), Wilson Felipe Pereira, linux-kernel
Remove the NULL terminator from the bootloader array, make its entries
const, and use ARRAY_SIZE() as the loop bound. Make the array itself
static and mark it __initconst, since it is only used during
initialization.
Also reuse the loop index i instead of redeclaring it multiple times.
Signed-off-by: Thorsten Blum <blum@kernel.org>
---
Changes in v2:
- Make bootloader[] static and mark it __initconst (Andrew)
- v1: https://lore.kernel.org/r/20261118000037.552633-2-blum@kernel.org/
init/main.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/init/main.c b/init/main.c
index 7b0c8c34e6a9..185a62277028 100644
--- a/init/main.c
+++ b/init/main.c
@@ -576,7 +576,8 @@ static int __init unknown_bootoption(char *param, char *val,
* 1. LILO/Grub pass "BOOT_IMAGE=...";
* 2. kexec/kdump (kexec-tools) pass "kexec".
*/
- const char *bootloader[] = { "BOOT_IMAGE=", "kexec", NULL };
+ static const char * const bootloader[] __initconst = { "BOOT_IMAGE=", "kexec" };
+ unsigned int i;
/* Handle params aliased to sysctls */
if (sysctl_is_alias(param))
@@ -585,7 +586,7 @@ static int __init unknown_bootoption(char *param, char *val,
repair_env_string(param, val);
/* Handle bootloader identifier */
- for (int i = 0; bootloader[i]; i++) {
+ for (i = 0; i < ARRAY_SIZE(bootloader); i++) {
if (strstarts(param, bootloader[i]))
return 0;
}
@@ -603,7 +604,6 @@ static int __init unknown_bootoption(char *param, char *val,
if (val) {
/* Environment option */
- unsigned int i;
for (i = 0; envp_init[i]; i++) {
if (!strncmp(param, envp_init[i], len+1))
break;
@@ -615,7 +615,6 @@ static int __init unknown_bootoption(char *param, char *val,
envp_init[i] = param;
} else {
/* Command line option */
- unsigned int i;
for (i = 0; argv_init[i]; i++) {
if (i == MAX_INIT_ARGS) {
panic_later = "init";
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-18 11:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18 11:40 [PATCH v2] init: Use ARRAY_SIZE() in unknown_bootoption() Thorsten Blum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox