From 8d1ab42b2f12e2023643d4b8bdbc386b9e4a9826 Mon Sep 17 00:00:00 2001 From: Zhu Yanhai Date: Thu, 12 Jan 2012 17:18:24 -0800 Subject: [PATCH] --- yaml --- r: 284373 b: refs/heads/master c: d66c1ce7df6ceb94d1902ac865ad50df4ffdb95f h: refs/heads/master i: 284371: cea258e62239d00c6669d41c3d65a3b0b5aba2b2 v: v3 --- [refs] | 2 +- trunk/Documentation/cgroups/memory.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eef267ecf1d5..0345a08fa64a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f53d7ce32e13dbd09573b176e6521a04c2c77803 +refs/heads/master: d66c1ce7df6ceb94d1902ac865ad50df4ffdb95f diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt index 4d8774f6f48a..c7de7dac43b5 100644 --- a/trunk/Documentation/cgroups/memory.txt +++ b/trunk/Documentation/cgroups/memory.txt @@ -61,7 +61,7 @@ Brief summary of control files. memory.failcnt # show the number of memory usage hits limits memory.memsw.failcnt # show the number of memory+Swap hits limits memory.max_usage_in_bytes # show max memory usage recorded - memory.memsw.usage_in_bytes # show max memory+Swap usage recorded + memory.memsw.max_usage_in_bytes # show max memory+Swap usage recorded memory.soft_limit_in_bytes # set/show soft limit of memory usage memory.stat # show various statistics memory.use_hierarchy # set/show hierarchical account enabled