aboutsummaryrefslogtreecommitdiff
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 17:06:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 17:06:53 -0800
commita457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch)
tree23b1109d5d286d1e96424f0195ed8c3144e04eb1 /Documentation/filesystems
parentdbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff)
parentb3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r--Documentation/filesystems/proc.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index a4dcf42c2fd..944cf109a6f 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -418,7 +418,7 @@ VmallocChunk: 111088 kB
Dirty: Memory which is waiting to get written back to the disk
Writeback: Memory which is actively being written back to the disk
Mapped: files which have been mmaped, such as libraries
- Slab: in-kernel data structures cache
+ Slab: in-kernel data structures cache
CommitLimit: Based on the overcommit ratio ('vm.overcommit_ratio'),
this is the total amount of memory currently available to
be allocated on the system. This limit is only adhered to