Commit 1b10d2c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1e0c505e acbc3ecb

Documentation/filesystems/proc.rst

+7 −1
Original line number Diff line number Diff line
@@ -689,9 +689,15 @@ files are there, and which are missing. 
 File         Content

 ============ ===============================================================

 apm          Advanced power management info

 bootconfig   Kernel command line obtained from boot config,

 	      and, if there were kernel parameters from the

	      boot loader, a "# Parameters from bootloader:"

	      line followed by a line containing those

	      parameters prefixed by "# ".			(5.5)

 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

fs/proc/bootconfig.c

+6 −0
Original line number Diff line number Diff line
@@ -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);