Merge branch 'doc/4.2' into docs-next

[firefly-linux-kernel-4.4.55.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f6befa9855c128b193620cd83a0d654a9e5428df..e9159eb986ecabaaa7f18f790e8197ddde74e9a7 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2437,7 +2437,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        nomca           [IA-64] Disable machine check abort handling
 
-       nomce           [X86-32] Machine Check Exception
+       nomce           [X86-32] Disable Machine Check Exception
 
        nomfgpt         [X86-32] Disable Multi-Function General Purpose
                        Timer usage (for AMD Geode machines).
@@ -3787,6 +3787,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        READ_CAPACITY_16 command);
                                f = NO_REPORT_OPCODES (don't use report opcodes
                                        command, uas only);
+                               g = MAX_SECTORS_240 (don't transfer more than
+                                       240 sectors at a time, uas only);
                                h = CAPACITY_HEURISTICS (decrease the
                                        reported device capacity by one
                                        sector if the number is odd);