aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <[email protected]>2023-10-05 17:17:45 +0000
committerMasami Hiramatsu (Google) <[email protected]>2023-10-07 01:44:21 +0000
commit1c20c65ea03293bcb08765d320ae32a27b56224b (patch)
tree0768b15f8ab56cc3d2e25cb55b143387f0278501
parentLinux 6.6-rc4 (diff)
downloadkernel-1c20c65ea03293bcb08765d320ae32a27b56224b.tar.gz
kernel-1c20c65ea03293bcb08765d320ae32a27b56224b.zip
doc: Update /proc/cmdline documentation to include boot config
Update the /proc/cmdline documentation to explicitly state that this file provides kernel boot parameters obtained via boot config from the kernel image as well as those supplied by the boot loader. Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Paul E. McKenney <[email protected]> Acked-by: Masami Hiramatsu (Google) <[email protected]> Reviewed-by: Randy Dunlap <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Arnd Bergmann <[email protected]> Signed-off-by: Masami Hiramatsu (Google) <[email protected]>
-rw-r--r--Documentation/filesystems/proc.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst
index 2b59cff8be17..36da7038a1c9 100644
--- a/Documentation/filesystems/proc.rst
+++ b/Documentation/filesystems/proc.rst
@@ -691,7 +691,8 @@ files are there, and which are missing.
apm Advanced power management info
buddyinfo Kernel memory allocator information (see text) (2.5)
bus Directory containing bus specific information
- cmdline Kernel command line
+ cmdline Kernel command line, both from bootloader and embedded
+ in the kernel image
cpuinfo Info about the CPU
devices Available devices (block and character)
dma Used DMS channels