Merge branch 'akpm' (second patch-bomb from Andrew)

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index eacb2e0..4a337da 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -829,6 +829,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        CONFIG_DEBUG_PAGEALLOC, hence this option will not help
                        tracking down these problems.
 
+       debug_pagealloc=
+                       [KNL] When CONFIG_DEBUG_PAGEALLOC is set, this
+                       parameter enables the feature at boot time. In
+                       default, it is disabled. We can avoid allocating huge
+                       chunk of memory for debug pagealloc if we don't enable
+                       it at boot time and the system will work mostly same
+                       with the kernel built without CONFIG_DEBUG_PAGEALLOC.
+                       on: enable the feature
+
        debugpat        [X86] Enable PAT debugging
 
        decnet.addr=    [HW,NET]
@@ -1228,9 +1237,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        multiple times interleaved with hugepages= to reserve
                        huge pages of different sizes. Valid pages sizes on
                        x86-64 are 2M (when the CPU supports "pse") and 1G
-                       (when the CPU supports the "pdpe1gb" cpuinfo flag)
-                       Note that 1GB pages can only be allocated at boot time
-                       using hugepages= and not freed afterwards.
+                       (when the CPU supports the "pdpe1gb" cpuinfo flag).
 
        hvc_iucv=       [S390] Number of z/VM IUCV hypervisor console (HVC)
                               terminal devices. Valid values: 0..8
@@ -2506,6 +2513,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        OSS             [HW,OSS]
                        See Documentation/sound/oss/oss-parameters.txt
 
+       page_owner=     [KNL] Boot-time page_owner enabling option.
+                       Storage of the information about who allocated
+                       each page is disabled in default. With this switch,
+                       we can turn it on.
+                       on: enable the feature
+
        panic=          [KNL] Kernel behaviour on panic: delay <timeout>
                        timeout > 0: seconds before rebooting
                        timeout = 0: wait forever
@@ -3434,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]