Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 68153642c44eeec0efe633016135f02c70e074c8..4a337daf0c09812a284aff91007fff40048f2a87 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3447,6 +3447,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        neutralize any effect of /proc/sys/kernel/sysrq.
                        Useful for debugging.
 
+       tcpmhash_entries= [KNL,NET]
+                       Set the number of tcp_metrics_hash slots.
+                       Default value is 8192 or 16384 depending on total
+                       ram pages. This is used to specify the TCP metrics
+                       cache size. See Documentation/networking/ip-sysctl.txt
+                       "tcp_no_metrics_save" section for more details.
+
        tdfx=           [HW,DRM]
 
        test_suspend=   [SUSPEND][,N]