File tree Expand file tree Collapse file tree 3 files changed +10
-2
lines changed Expand file tree Collapse file tree 3 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -1218,7 +1218,6 @@ endif
1218
1218
config BOOT_CONFIG
1219
1219
bool "Boot config support"
1220
1220
depends on BLK_DEV_INITRD
1221
- default y
1222
1221
help
1223
1222
Extra boot config allows system admin to pass a config file as
1224
1223
complemental extension of kernel cmdline when booting.
Original file line number Diff line number Diff line change @@ -418,6 +418,14 @@ static void __init setup_boot_config(const char *cmdline)
418
418
}
419
419
#else
420
420
#define setup_boot_config (cmdline ) do { } while (0)
421
+
422
+ static int __init warn_bootconfig (char * str )
423
+ {
424
+ pr_warn ("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOTCONFIG is not set.\n" );
425
+ return 0 ;
426
+ }
427
+ early_param ("bootconfig" , warn_bootconfig );
428
+
421
429
#endif
422
430
423
431
/* Change NUL term back to "=", to make "param" the whole string. */
Original file line number Diff line number Diff line change @@ -143,7 +143,8 @@ if FTRACE
143
143
144
144
config BOOTTIME_TRACING
145
145
bool "Boot-time Tracing support"
146
- depends on BOOT_CONFIG && TRACING
146
+ depends on TRACING
147
+ select BOOT_CONFIG
147
148
default y
148
149
help
149
150
Enable developer to setup ftrace subsystem via supplemental
You can’t perform that action at this time.
0 commit comments