Merge branch 'pci/switchtec'

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

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 944e03e29f65c9d31075d59bb06f8732d9fc4245..c74027c55f4706cec7e75444d609126b9656abbe 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2276,6 +2276,15 @@
        lockd.nlm_udpport=M     [NFS] Assign UDP port.
                        Format: <integer>
 
+       lockdown=       [SECURITY]
+                       { integrity | confidentiality }
+                       Enable the kernel lockdown feature. If set to
+                       integrity, kernel features that allow userland to
+                       modify the running kernel are disabled. If set to
+                       confidentiality, kernel features that allow userland
+                       to extract confidential information from the kernel
+                       are also disabled.
+
        locktorture.nreaders_stress= [KNL]
                        Set the number of locking read-acquisition kthreads.
                        Defaults to being automatically set based on the
@@ -3483,8 +3492,15 @@
                hpiosize=nn[KMG]        The fixed amount of bus space which is
                                reserved for hotplug bridge's IO window.
                                Default size is 256 bytes.
+               hpmmiosize=nn[KMG]      The fixed amount of bus space which is
+                               reserved for hotplug bridge's MMIO window.
+                               Default size is 2 megabytes.
+               hpmmioprefsize=nn[KMG]  The fixed amount of bus space which is
+                               reserved for hotplug bridge's MMIO_PREF window.
+                               Default size is 2 megabytes.
                hpmemsize=nn[KMG]       The fixed amount of bus space which is
-                               reserved for hotplug bridge's memory window.
+                               reserved for hotplug bridge's MMIO and
+                               MMIO_PREF window.
                                Default size is 2 megabytes.
                hpbussize=nn    The minimum amount of additional bus numbers
                                reserved for buses below a hotplug bridge.
@@ -3531,6 +3547,8 @@
                        even if the platform doesn't give the OS permission to
                        use them.  This may cause conflicts if the platform
                        also tries to use these services.
+               dpc-native      Use native PCIe service for DPC only.  May
+                               cause conflicts if firmware uses AER or DPC.
                compat  Disable native PCIe services (PME, AER, DPC, PCIe
                        hotplug).
 
@@ -5293,6 +5311,10 @@
                                the unplug protocol
                        never -- do not unplug even if version check succeeds
 
+       xen_legacy_crash        [X86,XEN]
+                       Crash from Xen panic notifier, without executing late
+                       panic() code such as dumping handler.
+
        xen_nopvspin    [X86,XEN]
                        Disables the ticketlock slowpath using Xen PV
                        optimizations.