vserver 1.9.5.x5

[linux-2.6.git] / Documentation / sysctl / vm.txt

diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index b0349d8..2f1aae3 100644 (file)
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -31,7 +31,7 @@ Currently, these files are in /proc/sys/vm:
 
 dirty_ratio, dirty_background_ratio, dirty_expire_centisecs,
 dirty_writeback_centisecs, vfs_cache_pressure, laptop_mode,
 
 dirty_ratio, dirty_background_ratio, dirty_expire_centisecs,
 dirty_writeback_centisecs, vfs_cache_pressure, laptop_mode,

-block_dump:
+block_dump, swap_token_timeout:

 
 See Documentation/filesystems/proc.txt
 
 
 See Documentation/filesystems/proc.txt
 


@@ -47,7 +47,7 @@ of free memory left when userspace requests more memory.
 When this flag is 1, the kernel pretends there is always enough
 memory until it actually runs out.
 
 When this flag is 1, the kernel pretends there is always enough
 memory until it actually runs out.
 

-When this flag is 2, the kernel uses a "strict overcommit" 
+When this flag is 2, the kernel uses a "never overcommit"

 policy that attempts to prevent any overcommit of memory.  
 
 This feature can be very useful because there are a lot of
 policy that attempts to prevent any overcommit of memory.  
 
 This feature can be very useful because there are a lot of