Merge tag 'docs-5.7-2' of git://git.lwn.net/linux

[tomoyo/tomoyo-test1.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 4d5a4fe..2ad7d7c 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -22,11 +22,13 @@
                        default: 0
 
        acpi_backlight= [HW,ACPI]
-                       acpi_backlight=vendor
-                       acpi_backlight=video
-                       If set to vendor, prefer vendor specific driver
+                       { vendor | video | native | none }
+                       If set to vendor, prefer vendor-specific driver
                        (e.g. thinkpad_acpi, sony_acpi, etc.) instead
                        of the ACPI video.ko driver.
+                       If set to video, use the ACPI video.ko driver.
+                       If set to native, use the device's native backlight mode.
+                       If set to none, disable the ACPI backlight interface.
 
        acpi_force_32bit_fadt_addr
                        force FADT to use 32 bit addresses rather than the
@@ -683,7 +685,7 @@
        coredump_filter=
                        [KNL] Change the default value for
                        /proc/<pid>/coredump_filter.
-                       See also Documentation/filesystems/proc.txt.
+                       See also Documentation/filesystems/proc.rst.
 
        coresight_cpu_debug.enable
                        [ARM,ARM64]
@@ -960,7 +962,7 @@
                        edid/1680x1050.bin, or edid/1920x1080.bin is given
                        and no file with the same name exists. Details and
                        instructions how to build your own EDID data are
-                       available in Documentation/driver-api/edid.rst. An EDID
+                       available in Documentation/admin-guide/edid.rst. An EDID
                        data set will only be used for a particular connector,
                        if its name and a colon are prepended to the EDID
                        name. Each connector may use a unique EDID data
@@ -990,10 +992,6 @@
                        Documentation/admin-guide/dynamic-debug-howto.rst
                        for details.
 
-       nompx           [X86] Disables Intel Memory Protection Extensions.
-                       See Documentation/x86/intel_mpx.rst for more
-                       information about the feature.
-
        nopku           [X86] Disable Memory Protection Keys CPU feature found
                        in some Intel CPUs.
 
@@ -2571,13 +2569,22 @@
                        For details see: Documentation/admin-guide/hw-vuln/mds.rst
 
        mem=nn[KMG]     [KNL,BOOT] Force usage of a specific amount of memory
-                       Amount of memory to be used when the kernel is not able
-                       to see the whole system memory or for test.
+                       Amount of memory to be used in cases as follows:
+
+                       1 for test;
+                       2 when the kernel is not able to see the whole system memory;
+                       3 memory that lies after 'mem=' boundary is excluded from
+                        the hypervisor, then assigned to KVM guests.
+
                        [X86] Work as limiting max address. Use together
                        with memmap= to avoid physical address space collisions.
                        Without memmap= PCI devices could be placed at addresses
                        belonging to unused RAM.
 
+                       Note that this only takes effects during boot time since
+                       in above case 3, memory may need be hot added after boot
+                       if system memory of hypervisor is not sufficient.
+
        mem=nopentium   [BUGS=X86-32] Disable usage of 4MB pages for kernel
                        memory.
 
@@ -3720,6 +3727,9 @@
                        Override pmtimer IOPort with a hex value.
                        e.g. pmtmr=0x508
 
+       pm_debug_messages       [SUSPEND,KNL]
+                       Enable suspend/resume debug messages during boot up.
+
        pnp.debug=1     [PNP]
                        Enable PNP debug messages (depends on the
                        CONFIG_PNP_DEBUG_MESSAGES option).  Change at run-time