---

yaml --- r: 366301 b: refs/heads/master c: df7c6b9 h: refs/heads/master i: 366299: cf51160 v: v3
git-mirror · Mar 27, 2013 · 4f74903 · 4f74903
1 parent d510cbe
commit 4f74903
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8761e31c227f9751327196f170eba2b519eab48f
+refs/heads/master: df7c6b9927f62d332db612ef51c3234993aafd8c
diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt
@@ -194,7 +194,7 @@ the cgroup that brought it in -- this will happen on memory pressure).
 But see section 8.2: when moving a task to another cgroup, its pages may
 be recharged to the new cgroup, if move_charge_at_immigrate has been chosen.
 
-Exception: If CONFIG_CGROUP_CGROUP_MEMCG_SWAP is not used.
+Exception: If CONFIG_MEMCG_SWAP is not used.
 When you do swapoff and make swapped-out pages of shmem(tmpfs) to
 be backed into memory in force, charges for pages are accounted against the
 caller of swapoff rather than the users of shmem.