diff options
| author | Eric Anholt <eric@anholt.net> | 2010-05-07 17:30:03 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-10 16:36:52 -0400 |
| commit | 34dc4d4423dc342848d72be764832cbc0852854a (patch) | |
| tree | 056402a4afc2b7ef2f4dee30a712ce847279c13a /Documentation/cgroups/cgroups.txt | |
| parent | 3d8620cc5f8538364ee152811e2bd8713abb1d58 (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
Merge remote branch 'origin/master' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c
The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
Diffstat (limited to 'Documentation/cgroups/cgroups.txt')
| -rw-r--r-- | Documentation/cgroups/cgroups.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt index fd588ff0e296..a1ca5924faff 100644 --- a/Documentation/cgroups/cgroups.txt +++ b/Documentation/cgroups/cgroups.txt | |||
| @@ -235,8 +235,7 @@ containing the following files describing that cgroup: | |||
| 235 | - cgroup.procs: list of tgids in the cgroup. This list is not | 235 | - cgroup.procs: list of tgids in the cgroup. This list is not |
| 236 | guaranteed to be sorted or free of duplicate tgids, and userspace | 236 | guaranteed to be sorted or free of duplicate tgids, and userspace |
| 237 | should sort/uniquify the list if this property is required. | 237 | should sort/uniquify the list if this property is required. |
| 238 | Writing a tgid into this file moves all threads with that tgid into | 238 | This is a read-only file, for now. |
| 239 | this cgroup. | ||
| 240 | - notify_on_release flag: run the release agent on exit? | 239 | - notify_on_release flag: run the release agent on exit? |
| 241 | - release_agent: the path to use for release notifications (this file | 240 | - release_agent: the path to use for release notifications (this file |
| 242 | exists in the top cgroup only) | 241 | exists in the top cgroup only) |