summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-08-21 14:07:47 +0100
committerMark Brown <broonie@kernel.org>2026-08-21 14:07:47 +0100
commit52f605e669a545a78e5294d42259b8cd7b85bbcb (patch)
tree8c690650a03d33799e1062850854257603568389 /include/linux
parenteead08c618c1c1bda9622461ced111b585f8f84b (diff)
parent3df3ae98c30c249c4bbf3d74559cc6972898052c (diff)
downloadlinux-next-52f605e669a545a78e5294d42259b8cd7b85bbcb.tar.gz
linux-next-52f605e669a545a78e5294d42259b8cd7b85bbcb.zip
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bootconfig.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h
index 1c7f3b74ffcf..deda507500da 100644
--- a/include/linux/bootconfig.h
+++ b/include/linux/bootconfig.h
@@ -308,4 +308,18 @@ static inline const char *xbc_get_embedded_bootconfig(size_t *size)
}
#endif
+/* Bootconfig opt-in detection, shared by setup_arch() and setup_boot_config() */
+#ifdef CONFIG_BOOT_CONFIG
+bool __init bootconfig_cmdline_requested(const char *boot_cmdline, int *end_offset);
+#endif
+
+/* Build-time-rendered bootconfig cmdline prepended in setup_arch() */
+#ifdef CONFIG_CMDLINE_FROM_BOOTCONFIG
+void __init xbc_prepend_embedded_cmdline(char *dst, size_t size);
+bool __init xbc_embedded_cmdline_applied(void);
+#else
+static inline void xbc_prepend_embedded_cmdline(char *dst, size_t size) { }
+static inline bool xbc_embedded_cmdline_applied(void) { return false; }
+#endif
+
#endif