github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Bootconfig fixes for v7.4-rc1:

Browse Source 
- init/bootconfig: Pass init arguments in documented order
   Parse extra_init_args before command-line init arguments in
   start_kernel(). This ensures command-line options take precedence over
   bootconfig, matching the documented order and saved command line.
 -----BEGIN PGP SIGNATURE-----
 
 iQFPBAABCgA5FiEEh7BulGwFlgAOi5DV2/sHvwUrPxsFAmrl9DgbHG1hc2FtaS5o
 aXJhbWF0c3VAZ21haWwuY29tAAoJENv7B78FKz8bfW0IAMFRPD7zVlEBC6ABpdKO
 CLotTbRYTzAhW/TXPzmkehqJUhwCjMhaWDYXimwsPVH055yGGpZNAtBlU4Djf69R
 mEJzwlVg3pa92s51jKCPM0+NWf1/EQVETFAeRw37EkV+5xNFLoo0Hhc0PoRZ4PNl
 0tUqH66ssQvuhewNxFOYTtu+8bRpJQ5eGwX6aaBObMwaV7ieFT0y5GlKAcEUEBBR
 Ueqs3c0k251ELxLJO8T3DkYe6yr7KjdOkKQCufjoTmezjbKQuThMtooFwjjE7LEq
 lPDjncnpUypdHqc6/SFKRWLjw9KTro8o8VQmgUDgDXYAlzPXSguLVfO+8eZSnKhS
 jn4=
 =TB2L
 -----END PGP SIGNATURE-----

Merge tag 'bootconfig-fixes-v7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull bootconfig fix from Masami Hiramatsu:

 - init/bootconfig: Pass init arguments in documented order

   Parse extra_init_args before command-line init arguments in
   start_kernel(). This ensures command-line options take precedence
   over bootconfig, matching the documented order and saved command
   line.

* tag 'bootconfig-fixes-v7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  init/bootconfig: pass init arguments in documented order
This commit is contained in:
Linus Torvalds 2026-11-01 09:00:06 -08:00
commit cbaa266150
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/main.c
View File

@ -1085,12 +1085,12 @@ void start_kernel(void)
__stop___param - __start___param,
-1, -1, NULL, &unknown_bootoption);
print_unknown_bootoptions();
if (!IS_ERR_OR_NULL(after_dashes))
parse_args("Setting init args", after_dashes, NULL, 0, -1, -1,
NULL, set_init_arg);
if (extra_init_args)
parse_args("Setting extra init args", extra_init_args,
NULL, 0, -1, -1, NULL, set_init_arg);
if (!IS_ERR_OR_NULL(after_dashes))
parse_args("Setting init args", after_dashes, NULL, 0, -1, -1,
NULL, set_init_arg);
/* Architectural and non-timekeeping rng init, before allocator init */
random_init_early(command_line);