aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2011-01-12 20:00:29 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:03:16 -0500
commit1bdcd78e2445f1ef7097a3ae7ef12e8f9c4fb05f (patch)
tree3e3b1f3c7d2e51e28d0ca31cc803abc4f5b29ff3
parente0e34e977a7ca54bb2159169deefc0b6e033cc75 (diff)
cgroups: remove deprecated subsystem from examples.
The 'ns' cgroup is considered deprecated. Change the cgroup subsystem used in the examples of the cgroup documentation from 'ns' to 'blkio'. Signed-off-by: Trevor Woerner <twoerner@gmail.com> Acked-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/cgroups/cgroups.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index 190018b0c649..44b8b7af8019 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -355,13 +355,13 @@ subsystems, type:
355 355
356To change the set of subsystems bound to a mounted hierarchy, just 356To change the set of subsystems bound to a mounted hierarchy, just
357remount with different options: 357remount with different options:
358# mount -o remount,cpuset,ns hier1 /dev/cgroup 358# mount -o remount,cpuset,blkio hier1 /dev/cgroup
359 359
360Now memory is removed from the hierarchy and ns is added. 360Now memory is removed from the hierarchy and blkio is added.
361 361
362Note this will add ns to the hierarchy but won't remove memory or 362Note this will add blkio to the hierarchy but won't remove memory or
363cpuset, because the new options are appended to the old ones: 363cpuset, because the new options are appended to the old ones:
364# mount -o remount,ns /dev/cgroup 364# mount -o remount,blkio /dev/cgroup
365 365
366To Specify a hierarchy's release_agent: 366To Specify a hierarchy's release_agent:
367# mount -t cgroup -o cpuset,release_agent="/sbin/cpuset_release_agent" \ 367# mount -t cgroup -o cpuset,release_agent="/sbin/cpuset_release_agent" \