Commit:     2324c5dd47233859cd7ba6272d0601f26ce60dcd
Parent:     bc231d2a048010d5e0b49ac7fddbfa822fc41109
Author:     Li Zefan <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 23 15:24:12 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Feb 23 17:13:25 2008 -0800

    memcgroup: fix and update documentation
    - remove trailing " Bytes"s in the demonstration
    - remove section 4.4 (feature control_type has been removed)
    - fix reference section
    Signed-off-by: Li Zefan <[EMAIL PROTECTED]>
    Acked-by: KAMEZAWA Hiroyuki <[EMAIL PROTECTED]>
    Acked-by: Balbir Singh <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 Documentation/controllers/memory.txt |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Documentation/controllers/memory.txt 
index b5bbea9..6015347 100644
--- a/Documentation/controllers/memory.txt
+++ b/Documentation/controllers/memory.txt
@@ -170,14 +170,14 @@ NOTE: We can use a suffix (k, K, m, M, g or G) to 
indicate values in kilo,
 mega or gigabytes.
 # cat /cgroups/0/memory.limit_in_bytes
-4194304 Bytes
 NOTE: The interface has now changed to display the usage in bytes
 instead of pages
 We can check the usage:
 # cat /cgroups/0/memory.usage_in_bytes
-1216512 Bytes
 A successful write to this file does not guarantee a successful set of
 this limit to the value written into the file.  This can be due to a
@@ -187,7 +187,7 @@ this file after a write to guarantee the value committed by 
the kernel.
 # echo -n 1 > memory.limit_in_bytes
 # cat memory.limit_in_bytes
-4096 Bytes
 The memory.failcnt field gives the number of times that the cgroup limit was
@@ -233,13 +233,6 @@ cgroup might have some charge associated with it, even 
though all
 tasks have migrated away from it. Such charges are automatically dropped at
 rmdir() if there are no tasks.
-4.4 Choosing what to account  -- Page Cache (unmapped) vs RSS (mapped)?
-The type of memory accounted by the cgroup can be limited to just
-mapped pages by writing "1" to memory.control_type field
-echo -n 1 > memory.control_type
 5. TODO
 1. Add support for accounting huge pages (as a separate controller)
@@ -262,18 +255,19 @@ References
 3. Emelianov, Pavel. Resource controllers based on process cgroups
 4. Emelianov, Pavel. RSS controller based on process cgroups (v2)
 5. Emelianov, Pavel. RSS controller based on process cgroups (v3)
 6. Menage, Paul. Control Groups v10,
 7. Vaidyanathan, Srinivasan, Control Groups: Pagecache accounting and control
    subsystem (v3),
-8. Singh, Balbir. RSS controller V2 test results (lmbench),
+8. Singh, Balbir. RSS controller v2 test results (lmbench),
-9. Singh, Balbir. RSS controller V2 AIM9 results
+9. Singh, Balbir. RSS controller v2 AIM9 results
-10. Singh, Balbir. Memory controller v6 results,
+10. Singh, Balbir. Memory controller v6 test results,
-11. Singh, Balbir. Memory controller v6,
+11. Singh, Balbir. Memory controller introduction (v6),
 12. Corbet, Jonathan, Controlling memory use in cgroups,
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to