Merge tag 's390-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[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 ed9597e37415a5e2eb4841da2233685309613336..746030ae3b124e377c62c194eba892f985907927 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3728,6 +3728,8 @@
                                may put more devices in an IOMMU group.
                force_floating  [S390] Force usage of floating interrupts.
                nomio           [S390] Do not use MIO instructions.
+               norid           [S390] ignore the RID field and force use of
+                               one PCI domain per PCI function
 
        pcie_aspm=      [PCIE] Forcibly enable or disable PCIe Active State Power
                        Management.