diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
| commit | 489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch) | |
| tree | 2c7ed6a0042dc15c91ece08c5a3866f610ddca6d /Documentation/sysctl/vm.txt | |
| parent | b322b7816908487c08b89b72f838174c37d8c836 (diff) | |
| parent | 82d27b2b2f3a80ffa7759a49b9cba39e47df476e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
trivial: remove the trivial patch monkey's name from SubmittingPatches
trivial: Fix a typo in comment of addrconf_dad_start()
trivial: usb: fix missing space typo in doc
trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
trivial: Remove the hyphen from git commands
trivial: fix ETIMEOUT -> ETIMEDOUT typos
trivial: Kconfig: .ko is normally not included in module names
trivial: SubmittingPatches: fix typo
trivial: Documentation/dell_rbu.txt: fix typos
trivial: Fix Pavel's address in MAINTAINERS
trivial: ftrace:fix description of trace directory
trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
trivial: input/misc: Fix typo in Kconfig
trivial: fix grammo in bus_for_each_dev() kerneldoc
trivial: rbtree.txt: fix rb_entry() parameters in sample code
trivial: spelling fix in ppc code comments
trivial: fix typo in bio_alloc kernel doc
trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
trivial: Miscellaneous documentation typo fixes
trivial: fix typo milisecond/millisecond for documentation and source comments.
...
Diffstat (limited to 'Documentation/sysctl/vm.txt')
| -rw-r--r-- | Documentation/sysctl/vm.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index c302ddf629a0..6fab2dcbb4d3 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
| @@ -358,7 +358,7 @@ nr_pdflush_threads | |||
| 358 | The current number of pdflush threads. This value is read-only. | 358 | The current number of pdflush threads. This value is read-only. |
| 359 | The value changes according to the number of dirty pages in the system. | 359 | The value changes according to the number of dirty pages in the system. |
| 360 | 360 | ||
| 361 | When neccessary, additional pdflush threads are created, one per second, up to | 361 | When necessary, additional pdflush threads are created, one per second, up to |
| 362 | nr_pdflush_threads_max. | 362 | nr_pdflush_threads_max. |
| 363 | 363 | ||
| 364 | ============================================================== | 364 | ============================================================== |
| @@ -565,7 +565,7 @@ swappiness | |||
| 565 | 565 | ||
| 566 | This control is used to define how aggressive the kernel will swap | 566 | This control is used to define how aggressive the kernel will swap |
| 567 | memory pages. Higher values will increase agressiveness, lower values | 567 | memory pages. Higher values will increase agressiveness, lower values |
| 568 | descrease the amount of swap. | 568 | decrease the amount of swap. |
| 569 | 569 | ||
| 570 | The default value is 60. | 570 | The default value is 60. |
| 571 | 571 | ||