Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[karo-tx-linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e714a025c99dce327703147893ce1d74abf8d180..ad7e2e5088c126ce48e0362d1f3296f3e8b55d2b 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -526,7 +526,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        coherent_pool=nn[KMG]   [ARM,KNL]
                        Sets the size of memory pool for coherent, atomic dma
-                       allocations if Contiguous Memory Allocator (CMA) is used.
+                       allocations, by default set to 256K.
 
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
@@ -2936,6 +2936,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        initial READ(10) command);
                                o = CAPACITY_OK (accept the capacity
                                        reported by the device);
+                               p = WRITE_CACHE (the device cache is ON
+                                       by default);
                                r = IGNORE_RESIDUE (the device reports
                                        bogus residue values);
                                s = SINGLE_LUN (the device has only one