diff options
36 files changed, 32 insertions, 33 deletions
diff --git a/Documentation/cgroup-v1/blkio-controller.rst b/Documentation/admin-guide/cgroup-v1/blkio-controller.rst index 1d7d962933be..1d7d962933be 100644 --- a/Documentation/cgroup-v1/blkio-controller.rst +++ b/Documentation/admin-guide/cgroup-v1/blkio-controller.rst | |||
diff --git a/Documentation/cgroup-v1/cgroups.rst b/Documentation/admin-guide/cgroup-v1/cgroups.rst index 46bbe7e022d4..b0688011ed06 100644 --- a/Documentation/cgroup-v1/cgroups.rst +++ b/Documentation/admin-guide/cgroup-v1/cgroups.rst | |||
@@ -3,7 +3,7 @@ Control Groups | |||
3 | ============== | 3 | ============== |
4 | 4 | ||
5 | Written by Paul Menage <menage@google.com> based on | 5 | Written by Paul Menage <menage@google.com> based on |
6 | Documentation/cgroup-v1/cpusets.rst | 6 | Documentation/admin-guide/cgroup-v1/cpusets.rst |
7 | 7 | ||
8 | Original copyright statements from cpusets.txt: | 8 | Original copyright statements from cpusets.txt: |
9 | 9 | ||
@@ -76,7 +76,7 @@ On their own, the only use for cgroups is for simple job | |||
76 | tracking. The intention is that other subsystems hook into the generic | 76 | tracking. The intention is that other subsystems hook into the generic |
77 | cgroup support to provide new attributes for cgroups, such as | 77 | cgroup support to provide new attributes for cgroups, such as |
78 | accounting/limiting the resources which processes in a cgroup can | 78 | accounting/limiting the resources which processes in a cgroup can |
79 | access. For example, cpusets (see Documentation/cgroup-v1/cpusets.rst) allow | 79 | access. For example, cpusets (see Documentation/admin-guide/cgroup-v1/cpusets.rst) allow |
80 | you to associate a set of CPUs and a set of memory nodes with the | 80 | you to associate a set of CPUs and a set of memory nodes with the |
81 | tasks in each cgroup. | 81 | tasks in each cgroup. |
82 | 82 | ||
diff --git a/Documentation/cgroup-v1/cpuacct.rst b/Documentation/admin-guide/cgroup-v1/cpuacct.rst index d30ed81d2ad7..d30ed81d2ad7 100644 --- a/Documentation/cgroup-v1/cpuacct.rst +++ b/Documentation/admin-guide/cgroup-v1/cpuacct.rst | |||
diff --git a/Documentation/cgroup-v1/cpusets.rst b/Documentation/admin-guide/cgroup-v1/cpusets.rst index b6a42cdea72b..86a6ae995d54 100644 --- a/Documentation/cgroup-v1/cpusets.rst +++ b/Documentation/admin-guide/cgroup-v1/cpusets.rst | |||
@@ -49,7 +49,7 @@ hooks, beyond what is already present, required to manage dynamic | |||
49 | job placement on large systems. | 49 | job placement on large systems. |
50 | 50 | ||
51 | Cpusets use the generic cgroup subsystem described in | 51 | Cpusets use the generic cgroup subsystem described in |
52 | Documentation/cgroup-v1/cgroups.rst. | 52 | Documentation/admin-guide/cgroup-v1/cgroups.rst. |
53 | 53 | ||
54 | Requests by a task, using the sched_setaffinity(2) system call to | 54 | Requests by a task, using the sched_setaffinity(2) system call to |
55 | include CPUs in its CPU affinity mask, and using the mbind(2) and | 55 | include CPUs in its CPU affinity mask, and using the mbind(2) and |
diff --git a/Documentation/cgroup-v1/devices.rst b/Documentation/admin-guide/cgroup-v1/devices.rst index e1886783961e..e1886783961e 100644 --- a/Documentation/cgroup-v1/devices.rst +++ b/Documentation/admin-guide/cgroup-v1/devices.rst | |||
diff --git a/Documentation/cgroup-v1/freezer-subsystem.rst b/Documentation/admin-guide/cgroup-v1/freezer-subsystem.rst index 582d3427de3f..582d3427de3f 100644 --- a/Documentation/cgroup-v1/freezer-subsystem.rst +++ b/Documentation/admin-guide/cgroup-v1/freezer-subsystem.rst | |||
diff --git a/Documentation/cgroup-v1/hugetlb.rst b/Documentation/admin-guide/cgroup-v1/hugetlb.rst index a3902aa253a9..a3902aa253a9 100644 --- a/Documentation/cgroup-v1/hugetlb.rst +++ b/Documentation/admin-guide/cgroup-v1/hugetlb.rst | |||
diff --git a/Documentation/cgroup-v1/index.rst b/Documentation/admin-guide/cgroup-v1/index.rst index fe76d42edc11..10bf48bae0b0 100644 --- a/Documentation/cgroup-v1/index.rst +++ b/Documentation/admin-guide/cgroup-v1/index.rst | |||
@@ -1,5 +1,3 @@ | |||
1 | :orphan: | ||
2 | |||
3 | ======================== | 1 | ======================== |
4 | Control Groups version 1 | 2 | Control Groups version 1 |
5 | ======================== | 3 | ======================== |
diff --git a/Documentation/cgroup-v1/memcg_test.rst b/Documentation/admin-guide/cgroup-v1/memcg_test.rst index 91bd18c6a514..3f7115e07b5d 100644 --- a/Documentation/cgroup-v1/memcg_test.rst +++ b/Documentation/admin-guide/cgroup-v1/memcg_test.rst | |||
@@ -10,7 +10,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior | |||
10 | is complex. This is a document for memcg's internal behavior. | 10 | is complex. This is a document for memcg's internal behavior. |
11 | Please note that implementation details can be changed. | 11 | Please note that implementation details can be changed. |
12 | 12 | ||
13 | (*) Topics on API should be in Documentation/cgroup-v1/memory.rst) | 13 | (*) Topics on API should be in Documentation/admin-guide/cgroup-v1/memory.rst) |
14 | 14 | ||
15 | 0. How to record usage ? | 15 | 0. How to record usage ? |
16 | ======================== | 16 | ======================== |
@@ -327,7 +327,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y. | |||
327 | You can see charges have been moved by reading ``*.usage_in_bytes`` or | 327 | You can see charges have been moved by reading ``*.usage_in_bytes`` or |
328 | memory.stat of both A and B. | 328 | memory.stat of both A and B. |
329 | 329 | ||
330 | See 8.2 of Documentation/cgroup-v1/memory.rst to see what value should | 330 | See 8.2 of Documentation/admin-guide/cgroup-v1/memory.rst to see what value should |
331 | be written to move_charge_at_immigrate. | 331 | be written to move_charge_at_immigrate. |
332 | 332 | ||
333 | 9.10 Memory thresholds | 333 | 9.10 Memory thresholds |
diff --git a/Documentation/cgroup-v1/memory.rst b/Documentation/admin-guide/cgroup-v1/memory.rst index 41bdc038dad9..41bdc038dad9 100644 --- a/Documentation/cgroup-v1/memory.rst +++ b/Documentation/admin-guide/cgroup-v1/memory.rst | |||
diff --git a/Documentation/cgroup-v1/net_cls.rst b/Documentation/admin-guide/cgroup-v1/net_cls.rst index a2cf272af7a0..a2cf272af7a0 100644 --- a/Documentation/cgroup-v1/net_cls.rst +++ b/Documentation/admin-guide/cgroup-v1/net_cls.rst | |||
diff --git a/Documentation/cgroup-v1/net_prio.rst b/Documentation/admin-guide/cgroup-v1/net_prio.rst index b40905871c64..b40905871c64 100644 --- a/Documentation/cgroup-v1/net_prio.rst +++ b/Documentation/admin-guide/cgroup-v1/net_prio.rst | |||
diff --git a/Documentation/cgroup-v1/pids.rst b/Documentation/admin-guide/cgroup-v1/pids.rst index 6acebd9e72c8..6acebd9e72c8 100644 --- a/Documentation/cgroup-v1/pids.rst +++ b/Documentation/admin-guide/cgroup-v1/pids.rst | |||
diff --git a/Documentation/cgroup-v1/rdma.rst b/Documentation/admin-guide/cgroup-v1/rdma.rst index 2fcb0a9bf790..2fcb0a9bf790 100644 --- a/Documentation/cgroup-v1/rdma.rst +++ b/Documentation/admin-guide/cgroup-v1/rdma.rst | |||
diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index 080b18ce2a5d..ed4c5977d6e1 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst | |||
@@ -9,7 +9,7 @@ This is the authoritative documentation on the design, interface and | |||
9 | conventions of cgroup v2. It describes all userland-visible aspects | 9 | conventions of cgroup v2. It describes all userland-visible aspects |
10 | of cgroup including core and specific controller behaviors. All | 10 | of cgroup including core and specific controller behaviors. All |
11 | future changes must be reflected in this document. Documentation for | 11 | future changes must be reflected in this document. Documentation for |
12 | v1 is available under Documentation/cgroup-v1/. | 12 | v1 is available under Documentation/admin-guide/cgroup-v1/. |
13 | 13 | ||
14 | .. CONTENTS | 14 | .. CONTENTS |
15 | 15 | ||
diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst index 1f0d9b939311..a5fdb1a846ce 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst | |||
@@ -59,6 +59,7 @@ configure specific aspects of kernel behavior to your liking. | |||
59 | 59 | ||
60 | initrd | 60 | initrd |
61 | cgroup-v2 | 61 | cgroup-v2 |
62 | cgroup-v1/index | ||
62 | serial-console | 63 | serial-console |
63 | braille-console | 64 | braille-console |
64 | parport | 65 | parport |
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 78576aa45cce..a571a67e0c85 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt | |||
@@ -4089,7 +4089,7 @@ | |||
4089 | 4089 | ||
4090 | relax_domain_level= | 4090 | relax_domain_level= |
4091 | [KNL, SMP] Set scheduler's default relax_domain_level. | 4091 | [KNL, SMP] Set scheduler's default relax_domain_level. |
4092 | See Documentation/cgroup-v1/cpusets.rst. | 4092 | See Documentation/admin-guide/cgroup-v1/cpusets.rst. |
4093 | 4093 | ||
4094 | reserve= [KNL,BUGS] Force kernel to ignore I/O ports or memory | 4094 | reserve= [KNL,BUGS] Force kernel to ignore I/O ports or memory |
4095 | Format: <base1>,<size1>[,<base2>,<size2>,...] | 4095 | Format: <base1>,<size1>[,<base2>,<size2>,...] |
@@ -4599,7 +4599,7 @@ | |||
4599 | swapaccount=[0|1] | 4599 | swapaccount=[0|1] |
4600 | [KNL] Enable accounting of swap in memory resource | 4600 | [KNL] Enable accounting of swap in memory resource |
4601 | controller if no parameter or 1 is given or disable | 4601 | controller if no parameter or 1 is given or disable |
4602 | it if 0 is given (See Documentation/cgroup-v1/memory.rst) | 4602 | it if 0 is given (See Documentation/admin-guide/cgroup-v1/memory.rst) |
4603 | 4603 | ||
4604 | swiotlb= [ARM,IA-64,PPC,MIPS,X86] | 4604 | swiotlb= [ARM,IA-64,PPC,MIPS,X86] |
4605 | Format: { <int> | force | noforce } | 4605 | Format: { <int> | force | noforce } |
diff --git a/Documentation/admin-guide/mm/numa_memory_policy.rst b/Documentation/admin-guide/mm/numa_memory_policy.rst index 546f174e5d6a..8463f5538fda 100644 --- a/Documentation/admin-guide/mm/numa_memory_policy.rst +++ b/Documentation/admin-guide/mm/numa_memory_policy.rst | |||
@@ -15,7 +15,7 @@ document attempts to describe the concepts and APIs of the 2.6 memory policy | |||
15 | support. | 15 | support. |
16 | 16 | ||
17 | Memory policies should not be confused with cpusets | 17 | Memory policies should not be confused with cpusets |
18 | (``Documentation/cgroup-v1/cpusets.rst``) | 18 | (``Documentation/admin-guide/cgroup-v1/cpusets.rst``) |
19 | which is an administrative mechanism for restricting the nodes from which | 19 | which is an administrative mechanism for restricting the nodes from which |
20 | memory may be allocated by a set of processes. Memory policies are a | 20 | memory may be allocated by a set of processes. Memory policies are a |
21 | programming interface that a NUMA-aware application can take advantage of. When | 21 | programming interface that a NUMA-aware application can take advantage of. When |
diff --git a/Documentation/block/bfq-iosched.rst b/Documentation/block/bfq-iosched.rst index 2c13b2fc1888..0d237d402860 100644 --- a/Documentation/block/bfq-iosched.rst +++ b/Documentation/block/bfq-iosched.rst | |||
@@ -547,7 +547,7 @@ As for cgroups-v1 (blkio controller), the exact set of stat files | |||
547 | created, and kept up-to-date by bfq, depends on whether | 547 | created, and kept up-to-date by bfq, depends on whether |
548 | CONFIG_BFQ_CGROUP_DEBUG is set. If it is set, then bfq creates all | 548 | CONFIG_BFQ_CGROUP_DEBUG is set. If it is set, then bfq creates all |
549 | the stat files documented in | 549 | the stat files documented in |
550 | Documentation/cgroup-v1/blkio-controller.rst. If, instead, | 550 | Documentation/admin-guide/cgroup-v1/blkio-controller.rst. If, instead, |
551 | CONFIG_BFQ_CGROUP_DEBUG is not set, then bfq creates only the files:: | 551 | CONFIG_BFQ_CGROUP_DEBUG is not set, then bfq creates only the files:: |
552 | 552 | ||
553 | blkio.bfq.io_service_bytes | 553 | blkio.bfq.io_service_bytes |
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt index cad797a8a39e..5ecbc03e6b2f 100644 --- a/Documentation/filesystems/tmpfs.txt +++ b/Documentation/filesystems/tmpfs.txt | |||
@@ -98,7 +98,7 @@ A memory policy with a valid NodeList will be saved, as specified, for | |||
98 | use at file creation time. When a task allocates a file in the file | 98 | use at file creation time. When a task allocates a file in the file |
99 | system, the mount option memory policy will be applied with a NodeList, | 99 | system, the mount option memory policy will be applied with a NodeList, |
100 | if any, modified by the calling task's cpuset constraints | 100 | if any, modified by the calling task's cpuset constraints |
101 | [See Documentation/cgroup-v1/cpusets.rst] and any optional flags, listed | 101 | [See Documentation/admin-guide/cgroup-v1/cpusets.rst] and any optional flags, listed |
102 | below. If the resulting NodeLists is the empty set, the effective memory | 102 | below. If the resulting NodeLists is the empty set, the effective memory |
103 | policy for the file will revert to "default" policy. | 103 | policy for the file will revert to "default" policy. |
104 | 104 | ||
diff --git a/Documentation/kernel-per-CPU-kthreads.txt b/Documentation/kernel-per-CPU-kthreads.txt index 5623b9916411..4f18456dd3b1 100644 --- a/Documentation/kernel-per-CPU-kthreads.txt +++ b/Documentation/kernel-per-CPU-kthreads.txt | |||
@@ -12,7 +12,7 @@ References | |||
12 | 12 | ||
13 | - Documentation/IRQ-affinity.txt: Binding interrupts to sets of CPUs. | 13 | - Documentation/IRQ-affinity.txt: Binding interrupts to sets of CPUs. |
14 | 14 | ||
15 | - Documentation/cgroup-v1: Using cgroups to bind tasks to sets of CPUs. | 15 | - Documentation/admin-guide/cgroup-v1: Using cgroups to bind tasks to sets of CPUs. |
16 | 16 | ||
17 | - man taskset: Using the taskset command to bind tasks to sets | 17 | - man taskset: Using the taskset command to bind tasks to sets |
18 | of CPUs. | 18 | of CPUs. |
diff --git a/Documentation/scheduler/sched-deadline.rst b/Documentation/scheduler/sched-deadline.rst index 3391e86d810c..14a2f7bf63fe 100644 --- a/Documentation/scheduler/sched-deadline.rst +++ b/Documentation/scheduler/sched-deadline.rst | |||
@@ -669,7 +669,7 @@ Deadline Task Scheduling | |||
669 | 669 | ||
670 | -deadline tasks cannot have an affinity mask smaller that the entire | 670 | -deadline tasks cannot have an affinity mask smaller that the entire |
671 | root_domain they are created on. However, affinities can be specified | 671 | root_domain they are created on. However, affinities can be specified |
672 | through the cpuset facility (Documentation/cgroup-v1/cpusets.rst). | 672 | through the cpuset facility (Documentation/admin-guide/cgroup-v1/cpusets.rst). |
673 | 673 | ||
674 | 5.1 SCHED_DEADLINE and cpusets HOWTO | 674 | 5.1 SCHED_DEADLINE and cpusets HOWTO |
675 | ------------------------------------ | 675 | ------------------------------------ |
diff --git a/Documentation/scheduler/sched-design-CFS.rst b/Documentation/scheduler/sched-design-CFS.rst index 53b30d1967cf..a96c72651877 100644 --- a/Documentation/scheduler/sched-design-CFS.rst +++ b/Documentation/scheduler/sched-design-CFS.rst | |||
@@ -222,7 +222,7 @@ SCHED_BATCH) tasks. | |||
222 | 222 | ||
223 | These options need CONFIG_CGROUPS to be defined, and let the administrator | 223 | These options need CONFIG_CGROUPS to be defined, and let the administrator |
224 | create arbitrary groups of tasks, using the "cgroup" pseudo filesystem. See | 224 | create arbitrary groups of tasks, using the "cgroup" pseudo filesystem. See |
225 | Documentation/cgroup-v1/cgroups.rst for more information about this filesystem. | 225 | Documentation/admin-guide/cgroup-v1/cgroups.rst for more information about this filesystem. |
226 | 226 | ||
227 | When CONFIG_FAIR_GROUP_SCHED is defined, a "cpu.shares" file is created for each | 227 | When CONFIG_FAIR_GROUP_SCHED is defined, a "cpu.shares" file is created for each |
228 | group created using the pseudo filesystem. See example steps below to create | 228 | group created using the pseudo filesystem. See example steps below to create |
diff --git a/Documentation/scheduler/sched-rt-group.rst b/Documentation/scheduler/sched-rt-group.rst index d27d3f3712fd..655a096ec8fb 100644 --- a/Documentation/scheduler/sched-rt-group.rst +++ b/Documentation/scheduler/sched-rt-group.rst | |||
@@ -133,7 +133,7 @@ This uses the cgroup virtual file system and "<cgroup>/cpu.rt_runtime_us" | |||
133 | to control the CPU time reserved for each control group. | 133 | to control the CPU time reserved for each control group. |
134 | 134 | ||
135 | For more information on working with control groups, you should read | 135 | For more information on working with control groups, you should read |
136 | Documentation/cgroup-v1/cgroups.rst as well. | 136 | Documentation/admin-guide/cgroup-v1/cgroups.rst as well. |
137 | 137 | ||
138 | Group settings are checked against the following limits in order to keep the | 138 | Group settings are checked against the following limits in order to keep the |
139 | configuration schedulable: | 139 | configuration schedulable: |
diff --git a/Documentation/vm/numa.rst b/Documentation/vm/numa.rst index 130f3cfa1c19..99fdeca917ca 100644 --- a/Documentation/vm/numa.rst +++ b/Documentation/vm/numa.rst | |||
@@ -67,7 +67,7 @@ nodes. Each emulated node will manage a fraction of the underlying cells' | |||
67 | physical memory. NUMA emluation is useful for testing NUMA kernel and | 67 | physical memory. NUMA emluation is useful for testing NUMA kernel and |
68 | application features on non-NUMA platforms, and as a sort of memory resource | 68 | application features on non-NUMA platforms, and as a sort of memory resource |
69 | management mechanism when used together with cpusets. | 69 | management mechanism when used together with cpusets. |
70 | [see Documentation/cgroup-v1/cpusets.rst] | 70 | [see Documentation/admin-guide/cgroup-v1/cpusets.rst] |
71 | 71 | ||
72 | For each node with memory, Linux constructs an independent memory management | 72 | For each node with memory, Linux constructs an independent memory management |
73 | subsystem, complete with its own free page lists, in-use page lists, usage | 73 | subsystem, complete with its own free page lists, in-use page lists, usage |
@@ -114,7 +114,7 @@ allocation behavior using Linux NUMA memory policy. [see | |||
114 | 114 | ||
115 | System administrators can restrict the CPUs and nodes' memories that a non- | 115 | System administrators can restrict the CPUs and nodes' memories that a non- |
116 | privileged user can specify in the scheduling or NUMA commands and functions | 116 | privileged user can specify in the scheduling or NUMA commands and functions |
117 | using control groups and CPUsets. [see Documentation/cgroup-v1/cpusets.rst] | 117 | using control groups and CPUsets. [see Documentation/admin-guide/cgroup-v1/cpusets.rst] |
118 | 118 | ||
119 | On architectures that do not hide memoryless nodes, Linux will include only | 119 | On architectures that do not hide memoryless nodes, Linux will include only |
120 | zones [nodes] with memory in the zonelists. This means that for a memoryless | 120 | zones [nodes] with memory in the zonelists. This means that for a memoryless |
diff --git a/Documentation/vm/page_migration.rst b/Documentation/vm/page_migration.rst index 35bba27d5fff..1d6cd7db4e43 100644 --- a/Documentation/vm/page_migration.rst +++ b/Documentation/vm/page_migration.rst | |||
@@ -41,7 +41,7 @@ locations. | |||
41 | Larger installations usually partition the system using cpusets into | 41 | Larger installations usually partition the system using cpusets into |
42 | sections of nodes. Paul Jackson has equipped cpusets with the ability to | 42 | sections of nodes. Paul Jackson has equipped cpusets with the ability to |
43 | move pages when a task is moved to another cpuset (See | 43 | move pages when a task is moved to another cpuset (See |
44 | Documentation/cgroup-v1/cpusets.rst). | 44 | Documentation/admin-guide/cgroup-v1/cpusets.rst). |
45 | Cpusets allows the automation of process locality. If a task is moved to | 45 | Cpusets allows the automation of process locality. If a task is moved to |
46 | a new cpuset then also all its pages are moved with it so that the | 46 | a new cpuset then also all its pages are moved with it so that the |
47 | performance of the process does not sink dramatically. Also the pages | 47 | performance of the process does not sink dramatically. Also the pages |
diff --git a/Documentation/vm/unevictable-lru.rst b/Documentation/vm/unevictable-lru.rst index 109052215bce..17d0861b0f1d 100644 --- a/Documentation/vm/unevictable-lru.rst +++ b/Documentation/vm/unevictable-lru.rst | |||
@@ -98,7 +98,7 @@ Memory Control Group Interaction | |||
98 | -------------------------------- | 98 | -------------------------------- |
99 | 99 | ||
100 | The unevictable LRU facility interacts with the memory control group [aka | 100 | The unevictable LRU facility interacts with the memory control group [aka |
101 | memory controller; see Documentation/cgroup-v1/memory.rst] by extending the | 101 | memory controller; see Documentation/admin-guide/cgroup-v1/memory.rst] by extending the |
102 | lru_list enum. | 102 | lru_list enum. |
103 | 103 | ||
104 | The memory controller data structure automatically gets a per-zone unevictable | 104 | The memory controller data structure automatically gets a per-zone unevictable |
diff --git a/Documentation/x86/x86_64/fake-numa-for-cpusets.rst b/Documentation/x86/x86_64/fake-numa-for-cpusets.rst index 30108684ae87..ff9bcfd2cc14 100644 --- a/Documentation/x86/x86_64/fake-numa-for-cpusets.rst +++ b/Documentation/x86/x86_64/fake-numa-for-cpusets.rst | |||
@@ -15,7 +15,7 @@ assign them to cpusets and their attached tasks. This is a way of limiting the | |||
15 | amount of system memory that are available to a certain class of tasks. | 15 | amount of system memory that are available to a certain class of tasks. |
16 | 16 | ||
17 | For more information on the features of cpusets, see | 17 | For more information on the features of cpusets, see |
18 | Documentation/cgroup-v1/cpusets.rst. | 18 | Documentation/admin-guide/cgroup-v1/cpusets.rst. |
19 | There are a number of different configurations you can use for your needs. For | 19 | There are a number of different configurations you can use for your needs. For |
20 | more information on the numa=fake command line option and its various ways of | 20 | more information on the numa=fake command line option and its various ways of |
21 | configuring fake nodes, see Documentation/x86/x86_64/boot-options.rst. | 21 | configuring fake nodes, see Documentation/x86/x86_64/boot-options.rst. |
@@ -40,7 +40,7 @@ A machine may be split as follows with "numa=fake=4*512," as reported by dmesg:: | |||
40 | On node 3 totalpages: 131072 | 40 | On node 3 totalpages: 131072 |
41 | 41 | ||
42 | Now following the instructions for mounting the cpusets filesystem from | 42 | Now following the instructions for mounting the cpusets filesystem from |
43 | Documentation/cgroup-v1/cpusets.rst, you can assign fake nodes (i.e. contiguous memory | 43 | Documentation/admin-guide/cgroup-v1/cpusets.rst, you can assign fake nodes (i.e. contiguous memory |
44 | address spaces) to individual cpusets:: | 44 | address spaces) to individual cpusets:: |
45 | 45 | ||
46 | [root@xroads /]# mkdir exampleset | 46 | [root@xroads /]# mkdir exampleset |
diff --git a/MAINTAINERS b/MAINTAINERS index 0c603ea73034..c1593a668f80 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4158,7 +4158,7 @@ L: cgroups@vger.kernel.org | |||
4158 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git | 4158 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git |
4159 | S: Maintained | 4159 | S: Maintained |
4160 | F: Documentation/admin-guide/cgroup-v2.rst | 4160 | F: Documentation/admin-guide/cgroup-v2.rst |
4161 | F: Documentation/cgroup-v1/ | 4161 | F: Documentation/admin-guide/cgroup-v1/ |
4162 | F: include/linux/cgroup* | 4162 | F: include/linux/cgroup* |
4163 | F: kernel/cgroup/ | 4163 | F: kernel/cgroup/ |
4164 | 4164 | ||
@@ -4169,7 +4169,7 @@ W: http://www.bullopensource.org/cpuset/ | |||
4169 | W: http://oss.sgi.com/projects/cpusets/ | 4169 | W: http://oss.sgi.com/projects/cpusets/ |
4170 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git | 4170 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git |
4171 | S: Maintained | 4171 | S: Maintained |
4172 | F: Documentation/cgroup-v1/cpusets.rst | 4172 | F: Documentation/admin-guide/cgroup-v1/cpusets.rst |
4173 | F: include/linux/cpuset.h | 4173 | F: include/linux/cpuset.h |
4174 | F: kernel/cgroup/cpuset.c | 4174 | F: kernel/cgroup/cpuset.c |
4175 | 4175 | ||
diff --git a/block/Kconfig b/block/Kconfig index b16b3e075d31..8b5f8e560eb4 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
@@ -89,7 +89,7 @@ config BLK_DEV_THROTTLING | |||
89 | one needs to mount and use blkio cgroup controller for creating | 89 | one needs to mount and use blkio cgroup controller for creating |
90 | cgroups and specifying per device IO rate policies. | 90 | cgroups and specifying per device IO rate policies. |
91 | 91 | ||
92 | See Documentation/cgroup-v1/blkio-controller.rst for more information. | 92 | See Documentation/admin-guide/cgroup-v1/blkio-controller.rst for more information. |
93 | 93 | ||
94 | config BLK_DEV_THROTTLING_LOW | 94 | config BLK_DEV_THROTTLING_LOW |
95 | bool "Block throttling .low limit interface support (EXPERIMENTAL)" | 95 | bool "Block throttling .low limit interface support (EXPERIMENTAL)" |
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index c5311935239d..430e219e3aba 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h | |||
@@ -624,7 +624,7 @@ struct cftype { | |||
624 | 624 | ||
625 | /* | 625 | /* |
626 | * Control Group subsystem type. | 626 | * Control Group subsystem type. |
627 | * See Documentation/cgroup-v1/cgroups.rst for details | 627 | * See Documentation/admin-guide/cgroup-v1/cgroups.rst for details |
628 | */ | 628 | */ |
629 | struct cgroup_subsys { | 629 | struct cgroup_subsys { |
630 | struct cgroup_subsys_state *(*css_alloc)(struct cgroup_subsys_state *parent_css); | 630 | struct cgroup_subsys_state *(*css_alloc)(struct cgroup_subsys_state *parent_css); |
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 6f68438aa4ed..82699845ef79 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h | |||
@@ -806,7 +806,7 @@ union bpf_attr { | |||
806 | * based on a user-provided identifier for all traffic coming from | 806 | * based on a user-provided identifier for all traffic coming from |
807 | * the tasks belonging to the related cgroup. See also the related | 807 | * the tasks belonging to the related cgroup. See also the related |
808 | * kernel documentation, available from the Linux sources in file | 808 | * kernel documentation, available from the Linux sources in file |
809 | * *Documentation/cgroup-v1/net_cls.rst*. | 809 | * *Documentation/admin-guide/cgroup-v1/net_cls.rst*. |
810 | * | 810 | * |
811 | * The Linux kernel has two versions for cgroups: there are | 811 | * The Linux kernel has two versions for cgroups: there are |
812 | * cgroups v1 and cgroups v2. Both are available to users, who can | 812 | * cgroups v1 and cgroups v2. Both are available to users, who can |
diff --git a/init/Kconfig b/init/Kconfig index 9eb92ee52d40..381cdfee6e0e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -821,7 +821,7 @@ menuconfig CGROUPS | |||
821 | controls or device isolation. | 821 | controls or device isolation. |
822 | See | 822 | See |
823 | - Documentation/scheduler/sched-design-CFS.rst (CFS) | 823 | - Documentation/scheduler/sched-design-CFS.rst (CFS) |
824 | - Documentation/cgroup-v1/ (features for grouping, isolation | 824 | - Documentation/admin-guide/cgroup-v1/ (features for grouping, isolation |
825 | and resource control) | 825 | and resource control) |
826 | 826 | ||
827 | Say N if unsure. | 827 | Say N if unsure. |
@@ -883,7 +883,7 @@ config BLK_CGROUP | |||
883 | CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set | 883 | CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set |
884 | CONFIG_BLK_DEV_THROTTLING=y. | 884 | CONFIG_BLK_DEV_THROTTLING=y. |
885 | 885 | ||
886 | See Documentation/cgroup-v1/blkio-controller.rst for more information. | 886 | See Documentation/admin-guide/cgroup-v1/blkio-controller.rst for more information. |
887 | 887 | ||
888 | config CGROUP_WRITEBACK | 888 | config CGROUP_WRITEBACK |
889 | bool | 889 | bool |
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index b3b02b9c4405..863e434a6020 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c | |||
@@ -729,7 +729,7 @@ static inline int nr_cpusets(void) | |||
729 | * load balancing domains (sched domains) as specified by that partial | 729 | * load balancing domains (sched domains) as specified by that partial |
730 | * partition. | 730 | * partition. |
731 | * | 731 | * |
732 | * See "What is sched_load_balance" in Documentation/cgroup-v1/cpusets.rst | 732 | * See "What is sched_load_balance" in Documentation/admin-guide/cgroup-v1/cpusets.rst |
733 | * for a background explanation of this. | 733 | * for a background explanation of this. |
734 | * | 734 | * |
735 | * Does not return errors, on the theory that the callers of this | 735 | * Does not return errors, on the theory that the callers of this |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index c07196502577..725674f3276d 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
@@ -509,7 +509,7 @@ static inline int may_allow_all(struct dev_cgroup *parent) | |||
509 | * This is one of the three key functions for hierarchy implementation. | 509 | * This is one of the three key functions for hierarchy implementation. |
510 | * This function is responsible for re-evaluating all the cgroup's active | 510 | * This function is responsible for re-evaluating all the cgroup's active |
511 | * exceptions due to a parent's exception change. | 511 | * exceptions due to a parent's exception change. |
512 | * Refer to Documentation/cgroup-v1/devices.rst for more details. | 512 | * Refer to Documentation/admin-guide/cgroup-v1/devices.rst for more details. |
513 | */ | 513 | */ |
514 | static void revalidate_active_exceptions(struct dev_cgroup *devcg) | 514 | static void revalidate_active_exceptions(struct dev_cgroup *devcg) |
515 | { | 515 | { |
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f506c68b2612..17e2b1713702 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h | |||
@@ -806,7 +806,7 @@ union bpf_attr { | |||
806 | * based on a user-provided identifier for all traffic coming from | 806 | * based on a user-provided identifier for all traffic coming from |
807 | * the tasks belonging to the related cgroup. See also the related | 807 | * the tasks belonging to the related cgroup. See also the related |
808 | * kernel documentation, available from the Linux sources in file | 808 | * kernel documentation, available from the Linux sources in file |
809 | * *Documentation/cgroup-v1/net_cls.rst*. | 809 | * *Documentation/admin-guide/cgroup-v1/net_cls.rst*. |
810 | * | 810 | * |
811 | * The Linux kernel has two versions for cgroups: there are | 811 | * The Linux kernel has two versions for cgroups: there are |
812 | * cgroups v1 and cgroups v2. Both are available to users, who can | 812 | * cgroups v1 and cgroups v2. Both are available to users, who can |