diff options
Diffstat (limited to 'Documentation/sysctl')
-rw-r--r-- | Documentation/sysctl/net.txt | 2 | ||||
-rw-r--r-- | Documentation/sysctl/vm.txt | 32 |
2 files changed, 5 insertions, 29 deletions
diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt index a34d55b65441..df38ef046f8d 100644 --- a/Documentation/sysctl/net.txt +++ b/Documentation/sysctl/net.txt | |||
@@ -95,7 +95,7 @@ of struct cmsghdr structures with appended data. | |||
95 | 95 | ||
96 | There is only one file in this directory. | 96 | There is only one file in this directory. |
97 | unix_dgram_qlen limits the max number of datagrams queued in Unix domain | 97 | unix_dgram_qlen limits the max number of datagrams queued in Unix domain |
98 | socket's buffer. It will not take effect unless PF_UNIX flag is spicified. | 98 | socket's buffer. It will not take effect unless PF_UNIX flag is specified. |
99 | 99 | ||
100 | 100 | ||
101 | 3. /proc/sys/net/ipv4 - IPV4 settings | 101 | 3. /proc/sys/net/ipv4 - IPV4 settings |
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index 97c4b3284329..c302ddf629a0 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
@@ -39,8 +39,6 @@ Currently, these files are in /proc/sys/vm: | |||
39 | - nr_hugepages | 39 | - nr_hugepages |
40 | - nr_overcommit_hugepages | 40 | - nr_overcommit_hugepages |
41 | - nr_pdflush_threads | 41 | - nr_pdflush_threads |
42 | - nr_pdflush_threads_min | ||
43 | - nr_pdflush_threads_max | ||
44 | - nr_trim_pages (only if CONFIG_MMU=n) | 42 | - nr_trim_pages (only if CONFIG_MMU=n) |
45 | - numa_zonelist_order | 43 | - numa_zonelist_order |
46 | - oom_dump_tasks | 44 | - oom_dump_tasks |
@@ -90,6 +88,10 @@ will itself start writeback. | |||
90 | If dirty_bytes is written, dirty_ratio becomes a function of its value | 88 | If dirty_bytes is written, dirty_ratio becomes a function of its value |
91 | (dirty_bytes / the amount of dirtyable system memory). | 89 | (dirty_bytes / the amount of dirtyable system memory). |
92 | 90 | ||
91 | Note: the minimum value allowed for dirty_bytes is two pages (in bytes); any | ||
92 | value lower than this limit will be ignored and the old configuration will be | ||
93 | retained. | ||
94 | |||
93 | ============================================================== | 95 | ============================================================== |
94 | 96 | ||
95 | dirty_expire_centisecs | 97 | dirty_expire_centisecs |
@@ -465,32 +467,6 @@ The default value is 0. | |||
465 | 467 | ||
466 | ============================================================== | 468 | ============================================================== |
467 | 469 | ||
468 | nr_pdflush_threads_min | ||
469 | |||
470 | This value controls the minimum number of pdflush threads. | ||
471 | |||
472 | At boot time, the kernel will create and maintain 'nr_pdflush_threads_min' | ||
473 | threads for the kernel's lifetime. | ||
474 | |||
475 | The default value is 2. The minimum value you can specify is 1, and | ||
476 | the maximum value is the current setting of 'nr_pdflush_threads_max'. | ||
477 | |||
478 | See 'nr_pdflush_threads_max' below for more information. | ||
479 | |||
480 | ============================================================== | ||
481 | |||
482 | nr_pdflush_threads_max | ||
483 | |||
484 | This value controls the maximum number of pdflush threads that can be | ||
485 | created. The pdflush algorithm will create a new pdflush thread (up to | ||
486 | this maximum) if no pdflush threads have been available for >= 1 second. | ||
487 | |||
488 | The default value is 8. The minimum value you can specify is the | ||
489 | current value of 'nr_pdflush_threads_min' and the | ||
490 | maximum is 1000. | ||
491 | |||
492 | ============================================================== | ||
493 | |||
494 | overcommit_memory: | 470 | overcommit_memory: |
495 | 471 | ||
496 | This value contains a flag that enables memory overcommitment. | 472 | This value contains a flag that enables memory overcommitment. |