x86: various changes and cleanups to in_p/out_p delay details

[deliverable/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d29b6d926a42508b6020be3f7989e6dd33ed2140..b427b7c0e5d0298b20dc1e948594a2399df2160a 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -370,6 +370,9 @@ and is between 256 and 4096 characters. It is defined in the file
                        configured.  Potentially dangerous and should only be
                        used if you are entirely sure of the consequences.
 
+       ccw_timeout_log [S390]
+                       See Documentation/s390/CommonIO for details.
+
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }
                        See security/selinux/Kconfig help text.
@@ -791,6 +794,16 @@ and is between 256 and 4096 characters. It is defined in the file
                        for translation below 32 bit and if not available
                        then look in the higher range.
 
+       io_delay=       [X86-32,X86-64] I/O delay method
+               0x80
+                       Standard port 0x80 based delay
+               0xed
+                       Alternate port 0xed based delay (needed on some systems)
+               udelay
+                       Simple two microseconds delay
+               none
+                       No delay
+
        io7=            [HW] IO7 for Marvel based alpha systems
                        See comment before marvel_specify_io7 in
                        arch/alpha/kernel/core_marvel.c.