diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
| commit | 5f7b30cd766d3589a00750d6100f718347d8f495 (patch) | |
| tree | d97cb6934284dc98def18ae7daaa819acc2d50ed /Documentation/scheduler/sched-design-CFS.txt | |
| parent | c1ece76719205690f4b448460d9b85c130e8021b (diff) | |
| parent | bdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff) | |
| download | lwn-5f7b30cd766d3589a00750d6100f718347d8f495.tar.gz lwn-5f7b30cd766d3589a00750d6100f718347d8f495.zip | |
Merge branch 'docs-next' into docs-next-mergedocs-next-merge
Fix the Makefile merge conflict.
Diffstat (limited to 'Documentation/scheduler/sched-design-CFS.txt')
| -rw-r--r-- | Documentation/scheduler/sched-design-CFS.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scheduler/sched-design-CFS.txt b/Documentation/scheduler/sched-design-CFS.txt index f14f49304222..edd861c94c1b 100644 --- a/Documentation/scheduler/sched-design-CFS.txt +++ b/Documentation/scheduler/sched-design-CFS.txt @@ -215,7 +215,7 @@ SCHED_BATCH) tasks. These options need CONFIG_CGROUPS to be defined, and let the administrator create arbitrary groups of tasks, using the "cgroup" pseudo filesystem. See - Documentation/cgroups/cgroups.txt for more information about this filesystem. + Documentation/cgroup-v1/cgroups.txt for more information about this filesystem. When CONFIG_FAIR_GROUP_SCHED is defined, a "cpu.shares" file is created for each group created using the pseudo filesystem. See example steps below to create |