diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
| commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
| tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /Documentation/filesystems | |
| parent | dbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff) | |
| parent | b3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/proc.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index a4dcf42c2fd9..944cf109a6f5 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -418,7 +418,7 @@ VmallocChunk: 111088 kB | |||
| 418 | Dirty: Memory which is waiting to get written back to the disk | 418 | Dirty: Memory which is waiting to get written back to the disk |
| 419 | Writeback: Memory which is actively being written back to the disk | 419 | Writeback: Memory which is actively being written back to the disk |
| 420 | Mapped: files which have been mmaped, such as libraries | 420 | Mapped: files which have been mmaped, such as libraries |
| 421 | Slab: in-kernel data structures cache | 421 | Slab: in-kernel data structures cache |
| 422 | CommitLimit: Based on the overcommit ratio ('vm.overcommit_ratio'), | 422 | CommitLimit: Based on the overcommit ratio ('vm.overcommit_ratio'), |
| 423 | this is the total amount of memory currently available to | 423 | this is the total amount of memory currently available to |
| 424 | be allocated on the system. This limit is only adhered to | 424 | be allocated on the system. This limit is only adhered to |