aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/cgroups.txt
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-16 09:13:42 -0400
committerPaul Mackerras <paulus@samba.org>2008-05-16 09:13:42 -0400
commitfcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch)
treea99c0e14daaf31cb078812fb2fbc6abadfcd738f /Documentation/cgroups.txt
parent541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff)
parentf26a3988917913b3d11b2bd741601a2c64ab9204 (diff)
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'Documentation/cgroups.txt')
-rw-r--r--Documentation/cgroups.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroups.txt b/Documentation/cgroups.txt
index c298a6690e0d..824fc0274471 100644
--- a/Documentation/cgroups.txt
+++ b/Documentation/cgroups.txt
@@ -310,8 +310,8 @@ and then start a subshell 'sh' in that cgroup:
310 cd /dev/cgroup 310 cd /dev/cgroup
311 mkdir Charlie 311 mkdir Charlie
312 cd Charlie 312 cd Charlie
313 /bin/echo 2-3 > cpus 313 /bin/echo 2-3 > cpuset.cpus
314 /bin/echo 1 > mems 314 /bin/echo 1 > cpuset.mems
315 /bin/echo $$ > tasks 315 /bin/echo $$ > tasks
316 sh 316 sh
317 # The subshell 'sh' is now running in cgroup Charlie 317 # The subshell 'sh' is now running in cgroup Charlie