diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-01 16:07:05 -1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-01 16:07:05 -1000 |
commit | 1b10d2c8c6219bfc86d8c7d53a4f97a0a706d1ba (patch) | |
tree | ab160c4dfe3330fb4bcfa76ee4df3fb4ad82d462 /fs/proc | |
parent | 1e0c505e13162a2abe7c984309cfe2ae976b428d (diff) | |
parent | acbc3ecb806e24eb9c0cafc29e0884490dda6169 (diff) | |
download | lwn-1b10d2c8c6219bfc86d8c7d53a4f97a0a706d1ba.tar.gz lwn-1b10d2c8c6219bfc86d8c7d53a4f97a0a706d1ba.zip |
Merge tag 'bootconfig-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull bootconfig updates from Masami Hiramatsu:
- Documentation update for /proc/cmdline, which includes both the
parameters from bootloader and the embedded parameters in the kernel
- fs/proc: Add bootloader argument as a comment line to
/proc/bootconfig so that the user can distinguish what parameters
were passed from bootloader even if bootconfig modified that
- Documentation fix to add /proc/bootconfig to proc.rst
* tag 'bootconfig-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
doc: Add /proc/bootconfig to proc.rst
fs/proc: Add boot loader arguments as comment to /proc/bootconfig
doc: Update /proc/cmdline documentation to include boot config
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/bootconfig.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/proc/bootconfig.c b/fs/proc/bootconfig.c index 2e244ada1f97..902b326e1e56 100644 --- a/fs/proc/bootconfig.c +++ b/fs/proc/bootconfig.c @@ -62,6 +62,12 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size) break; dst += ret; } + if (ret >= 0 && boot_command_line[0]) { + ret = snprintf(dst, rest(dst, end), "# Parameters from bootloader:\n# %s\n", + boot_command_line); + if (ret > 0) + dst += ret; + } } out: kfree(key); |