path: root/Documentation/admin-guide
diff options
Diffstat (limited to 'Documentation/admin-guide')
2 files changed, 35 insertions, 3 deletions
diff --git a/Documentation/admin-guide/bootconfig.rst b/Documentation/admin-guide/bootconfig.rst
index b342a6796392..cf2edcd09183 100644
--- a/Documentation/admin-guide/bootconfig.rst
+++ b/Documentation/admin-guide/bootconfig.rst
@@ -62,6 +62,30 @@ Or more shorter, written as following::
In both styles, same key words are automatically merged when parsing it
at boot time. So you can append similar trees or key-values.
+Same-key Values
+It is prohibited that two or more values or arrays share a same-key.
+For example,::
+ foo = bar, baz
+ foo = qux # !ERROR! we can not re-define same key
+If you want to append the value to existing key as an array member,
+you can use ``+=`` operator. For example::
+ foo = bar, baz
+ foo += qux
+In this case, the key ``foo`` has ``bar``, ``baz`` and ``qux``.
+However, a sub-key and a value can not co-exist under a parent key.
+For example, following config is NOT allowed.::
+ foo = value1
+ foo.bar = value2 # !ERROR! subkey "bar" and value "value1" can NOT co-exist
@@ -102,9 +126,13 @@ Boot Kernel With a Boot Config
Since the boot configuration file is loaded with initrd, it will be added
-to the end of the initrd (initramfs) image file. The Linux kernel decodes
-the last part of the initrd image in memory to get the boot configuration
+to the end of the initrd (initramfs) image file with size, checksum and
+12-byte magic word as below.
+The Linux kernel decodes the last part of the initrd image in memory to
+get the boot configuration data.
Because of this "piggyback" method, there is no need to change or
update the boot loader and the kernel image itself.
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index dbc22d684627..c07815d230bc 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -136,6 +136,10 @@
dynamic table installation which will install SSDT
tables to /sys/firmware/acpi/tables/dynamic.
+ acpi_no_watchdog [HW,ACPI,WDT]
+ Ignore the ACPI-based watchdog interface (WDAT) and let
+ a native driver control the watchdog device instead.
acpi_rsdp= [ACPI,EFI,KEXEC]
Pass the RSDP address to the kernel, mostly used
on machines running EFI runtime service to boot the