diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-10 19:42:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-10 19:42:45 -0700 |
| commit | 03a55b63919f4b52b9c323d9a43ccccdc1cdb33b (patch) | |
| tree | 706e446ce39c2db9d7b88eaf09938fb222b67791 /include/linux | |
| parent | 9875c0beb8adaab602572b983fb59dbd761d5882 (diff) | |
| parent | c722cea208789d9e2660992bcd05fb9fac3adb56 (diff) | |
Merge tag 'bootconfig-fixes-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull bootconfig fixes from Masami Hiramatsu:
- show the original cmdline only once, and only if it was modeified by
bootconfig
* tag 'bootconfig-fixes-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
fs/proc: Skip bootloader comment if no embedded kernel parameters
fs/proc: remove redundant comments from /proc/bootconfig
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bootconfig.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h index ca73940e26df..e5ee2c694401 100644 --- a/include/linux/bootconfig.h +++ b/include/linux/bootconfig.h @@ -10,6 +10,7 @@ #ifdef __KERNEL__ #include <linux/kernel.h> #include <linux/types.h> +bool __init cmdline_has_extra_options(void); #else /* !__KERNEL__ */ /* * NOTE: This is only for tools/bootconfig, because tools/bootconfig will |