summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-02-24 01:27:01 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-02-24 01:27:01 +0300
commitf2b98d0af217f64b96bc549457018117ba6b7509 (patch)
tree3b83f60d6707a810b6f4142e9ba4dd43f4cccd32 /init
parentfcc77d7c8ef6478844547d50dd3d03270c86116c (diff)
parent6c40624930c58529185a257380442547580ed837 (diff)
downloadlinux-f2b98d0af217f64b96bc549457018117ba6b7509.tar.xz
Merge tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull bootconfig updates from Masami Hiramatsu: - Fix ftrace2bconf.sh tool for checking event enable status correctly - Add CONFIG_BOOT_CONFIG_FORCE to apply bootconfig without 'bootconfig' boot parameter - Enable CONFIG_BOOT_CONFIG_FORCE by default if a bootconfig is embedded in the kernel - Increase max number of nodes of bootconfig to 8192 * tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: bootconfig: Increase max nodes of bootconfig from 1024 to 8192 for DCC support bootconfig: Default BOOT_CONFIG_FORCE to y if BOOT_CONFIG_EMBED Allow forcing unconditional bootconfig processing tools/bootconfig: fix single & used for logical condition
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig13
-rw-r--r--init/main.c2
2 files changed, 14 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 77a4318a6043..8a27575895ec 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1384,6 +1384,19 @@ config BOOT_CONFIG
If unsure, say Y.
+config BOOT_CONFIG_FORCE
+ bool "Force unconditional bootconfig processing"
+ depends on BOOT_CONFIG
+ default y if BOOT_CONFIG_EMBED
+ help
+ With this Kconfig option set, BOOT_CONFIG processing is carried
+ out even when the "bootconfig" kernel-boot parameter is omitted.
+ In fact, with this Kconfig option set, there is no way to
+ make the kernel ignore the BOOT_CONFIG-supplied kernel-boot
+ parameters.
+
+ If unsure, say N.
+
config BOOT_CONFIG_EMBED
bool "Embed bootconfig file in the kernel"
depends on BOOT_CONFIG
diff --git a/init/main.c b/init/main.c
index e1c3911d7c70..669cb892e6c1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -156,7 +156,7 @@ static char *extra_init_args;
#ifdef CONFIG_BOOT_CONFIG
/* Is bootconfig on command line? */
-static bool bootconfig_found;
+static bool bootconfig_found = IS_ENABLED(CONFIG_BOOT_CONFIG_FORCE);
static size_t initargs_offs;
#else
# define bootconfig_found false