aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorMinto Joseph <mvaliyav@redhat.com>2013-09-11 17:24:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 18:59:03 -0400
commit4649602265495a3bb776d777c91dba569f4afb5d (patch)
treeba4f73203d6e992b917d4d3614439e9ff88f9a9d /Documentation/filesystems
parentbe49b30a98fe7e20f898fcfe7b6c082700fb96e8 (diff)
Documentation/filesystems/proc.txt: fix mistake in the description of Committed_AS
Fix mistake in the description of Committed_AS in kernel documentation. Signed-off-by: Minto Joseph <mvaliyav@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r--Documentation/filesystems/proc.txt19
1 files changed, 9 insertions, 10 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index fcc22c982a25..823c95faebd2 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -854,16 +854,15 @@ Committed_AS: The amount of memory presently allocated on the system.
854 The committed memory is a sum of all of the memory which 854 The committed memory is a sum of all of the memory which
855 has been allocated by processes, even if it has not been 855 has been allocated by processes, even if it has not been
856 "used" by them as of yet. A process which malloc()'s 1G 856 "used" by them as of yet. A process which malloc()'s 1G
857 of memory, but only touches 300M of it will only show up 857 of memory, but only touches 300M of it will show up as
858 as using 300M of memory even if it has the address space 858 using 1G. This 1G is memory which has been "committed" to
859 allocated for the entire 1G. This 1G is memory which has 859 by the VM and can be used at any time by the allocating
860 been "committed" to by the VM and can be used at any time 860 application. With strict overcommit enabled on the system
861 by the allocating application. With strict overcommit 861 (mode 2 in 'vm.overcommit_memory'),allocations which would
862 enabled on the system (mode 2 in 'vm.overcommit_memory'), 862 exceed the CommitLimit (detailed above) will not be permitted.
863 allocations which would exceed the CommitLimit (detailed 863 This is useful if one needs to guarantee that processes will
864 above) will not be permitted. This is useful if one needs 864 not fail due to lack of memory once that memory has been
865 to guarantee that processes will not fail due to lack of 865 successfully allocated.
866 memory once that memory has been successfully allocated.
867VmallocTotal: total size of vmalloc memory area 866VmallocTotal: total size of vmalloc memory area
868 VmallocUsed: amount of vmalloc area which is used 867 VmallocUsed: amount of vmalloc area which is used
869VmallocChunk: largest contiguous block of vmalloc area which is free 868VmallocChunk: largest contiguous block of vmalloc area which is free