summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2011-11-04 11:22:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-04 12:01:46 -0700
commit5fe69d7e258a17d825d982ac695c1db5c4bc4768 (patch)
tree15ba822eb23700a594387e6667a8f72f44f63920 /Documentation
parentdee119b1fa672d65f34f86fe5cefa81d71ed040e (diff)
downloadlinux-5fe69d7e258a17d825d982ac695c1db5c4bc4768.tar.bz2
Documentation: update cgroups notes
- ns cgroup has been removed. - it's true moving a task to another cgroup can fail. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Paul Menage <paul@paulmenage.org> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cgroups/cgroups.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index cd67e90003c0..9c452ef2328c 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -454,8 +454,8 @@ mounted hierarchy, to remove a task from its current cgroup you must
move it into a new cgroup (possibly the root cgroup) by writing to the
new cgroup's tasks file.
-Note: If the ns cgroup is active, moving a process to another cgroup can
-fail.
+Note: Due to some restrictions enforced by some cgroup subsystems, moving
+a process to another cgroup can fail.
2.3 Mounting hierarchies by name
--------------------------------