trivial: fix where cgroup documentation is not correctly referred to

cgroup documentation was moved to Documentation/cgroups/. There are some
places that still refer to Documentation/controllers/,
Documentation/cgroups.txt and Documentation/cpusets.txt. Fix those.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Paul Menage <menage@google.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 2a39aeba1464b8f66ed9cfe1dc7f20d40bbeb15f..d05737aaa84ba1a4ff9606386b652d62bbee63f4 100644 (file)
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -86,6 +86,8 @@ cachetlb.txt
        - describes the cache/TLB flushing interfaces Linux uses.
 cdrom/
        - directory with information on the CD-ROM drivers that Linux has.
        - describes the cache/TLB flushing interfaces Linux uses.
 cdrom/
        - directory with information on the CD-ROM drivers that Linux has.

+cgroups/
+       - cgroups features, including cpusets and memory controller.

 connector/
        - docs on the netlink based userspace<->kernel space communication mod.
 console/
 connector/
        - docs on the netlink based userspace<->kernel space communication mod.
 console/


@@ -98,8 +100,6 @@ cpu-load.txt
        - document describing how CPU load statistics are collected.
 cpuidle/
        - info on CPU_IDLE, CPU idle state management subsystem.
        - document describing how CPU load statistics are collected.
 cpuidle/
        - info on CPU_IDLE, CPU idle state management subsystem.

-cpusets.txt
-       - documents the cpusets feature; assign CPUs and Mem to a set of tasks.

 cputopology.txt
        - documentation on how CPU topology info is exported via sysfs.
 cris/
 cputopology.txt
        - documentation on how CPU topology info is exported via sysfs.
 cris/

diff --git a/Documentation/cgroups/00-INDEX b/Documentation/cgroups/00-INDEX
new file mode 100644 (file)
index 0000000..3f58fa3
--- /dev/null
+++ b/Documentation/cgroups/00-INDEX
@@ -0,0 +1,18 @@
+00-INDEX
+       - this file
+cgroups.txt
+       - Control Groups definition, implementation details, examples and API.
+cpuacct.txt
+       - CPU Accounting Controller; account CPU usage for groups of tasks.
+cpusets.txt
+       - documents the cpusets feature; assign CPUs and Mem to a set of tasks.
+devices.txt
+       - Device Whitelist Controller; description, interface and security.
+freezer-subsystem.txt
+       - checkpointing; rationale to not use signals, interface.
+memcg_test.txt
+       - Memory Resource Controller; implementation details.
+memory.txt
+       - Memory Resource Controller; design, accounting, interface, testing.
+resource_counter.txt
+       - Resource Counter API.

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index be3bde51b56413c27ad92a3949b816d645f15768..755def2cb071b94726ab7902853f1dbf149d1f30 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1593,7 +1593,7 @@ and is between 256 and 4096 characters. It is defined in the file
        nosoftlockup    [KNL] Disable the soft-lockup detector.
 
        noswapaccount   [KNL] Disable accounting of swap in memory resource
        nosoftlockup    [KNL] Disable the soft-lockup detector.
 
        noswapaccount   [KNL] Disable accounting of swap in memory resource

-                       controller. (See Documentation/controllers/memory.txt)
+                       controller. (See Documentation/cgroups/memory.txt)

 
        nosync          [HW,M68K] Disables sync negotiation for all devices.
 
 
        nosync          [HW,M68K] Disables sync negotiation for all devices.
 


@@ -1932,7 +1932,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        relax_domain_level=
                        [KNL, SMP] Set scheduler's default relax_domain_level.
 
        relax_domain_level=
                        [KNL, SMP] Set scheduler's default relax_domain_level.

-                       See Documentation/cpusets.txt.
+                       See Documentation/cgroups/cpusets.txt.

 
        reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
 
 
        reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
 

diff --git a/Documentation/scheduler/sched-rt-group.txt b/Documentation/scheduler/sched-rt-group.txt
index 3ef339f491e09058e37659f0bf96c52022b5dec7..5ba4d3fc625a424b341bfa5b5853473eaf80fe6a 100644 (file)
--- a/Documentation/scheduler/sched-rt-group.txt
+++ b/Documentation/scheduler/sched-rt-group.txt
@@ -126,7 +126,7 @@ This uses the /cgroup virtual file system and "/cgroup/<cgroup>/cpu.rt_runtime_u
 to control the CPU time reserved for each control group instead.
 
 For more information on working with control groups, you should read
 to control the CPU time reserved for each control group instead.
 
 For more information on working with control groups, you should read

-Documentation/cgroups.txt as well.
+Documentation/cgroups/cgroups.txt as well.

 
 Group settings are checked against the following limits in order to keep the configuration
 schedulable:
 
 Group settings are checked against the following limits in order to keep the configuration
 schedulable:

diff --git a/Documentation/vm/numa_memory_policy.txt b/Documentation/vm/numa_memory_policy.txt
index 6aaaeb38730cf0ff1d5389cd73a6a8d2fb6bd413..be45dbb9d7f23ef17c472ef981f4a42512480229 100644 (file)
--- a/Documentation/vm/numa_memory_policy.txt
+++ b/Documentation/vm/numa_memory_policy.txt
@@ -8,7 +8,8 @@ The current memory policy support was added to Linux 2.6 around May 2004.  This
 document attempts to describe the concepts and APIs of the 2.6 memory policy
 support.
 
 document attempts to describe the concepts and APIs of the 2.6 memory policy
 support.
 

-Memory policies should not be confused with cpusets (Documentation/cpusets.txt)
+Memory policies should not be confused with cpusets
+(Documentation/cgroups/cpusets.txt)

 which is an administrative mechanism for restricting the nodes from which
 memory may be allocated by a set of processes. Memory policies are a
 programming interface that a NUMA-aware application can take advantage of.  When
 which is an administrative mechanism for restricting the nodes from which
 memory may be allocated by a set of processes. Memory policies are a
 programming interface that a NUMA-aware application can take advantage of.  When

diff --git a/Documentation/vm/page_migration b/Documentation/vm/page_migration
index d5fdfd34bbaf4835bd7381b93cdd09774f8b9b01..6513fe2d90b8084743bd66ebcb5a5bd73c64482b 100644 (file)
--- a/Documentation/vm/page_migration
+++ b/Documentation/vm/page_migration
@@ -37,7 +37,8 @@ locations.
 
 Larger installations usually partition the system using cpusets into
 sections of nodes. Paul Jackson has equipped cpusets with the ability to
 
 Larger installations usually partition the system using cpusets into
 sections of nodes. Paul Jackson has equipped cpusets with the ability to

-move pages when a task is moved to another cpuset (See ../cpusets.txt).
+move pages when a task is moved to another cpuset (See
+Documentation/cgroups/cpusets.txt).

 Cpusets allows the automation of process locality. If a task is moved to
 a new cpuset then also all its pages are moved with it so that the
 performance of the process does not sink dramatically. Also the pages
 Cpusets allows the automation of process locality. If a task is moved to
 a new cpuset then also all its pages are moved with it so that the
 performance of the process does not sink dramatically. Also the pages

diff --git a/Documentation/x86/x86_64/fake-numa-for-cpusets b/Documentation/x86/x86_64/fake-numa-for-cpusets
index 33bb56655991421f8a5e7e24f695eab0ce73fe63..0f11d9becb0b4001657d6ca6b6391f473d3c524e 100644 (file)
--- a/Documentation/x86/x86_64/fake-numa-for-cpusets
+++ b/Documentation/x86/x86_64/fake-numa-for-cpusets
@@ -7,7 +7,8 @@ you can create fake NUMA nodes that represent contiguous chunks of memory and
 assign them to cpusets and their attached tasks.  This is a way of limiting the
 amount of system memory that are available to a certain class of tasks.
 
 assign them to cpusets and their attached tasks.  This is a way of limiting the
 amount of system memory that are available to a certain class of tasks.
 

-For more information on the features of cpusets, see Documentation/cpusets.txt.
+For more information on the features of cpusets, see
+Documentation/cgroups/cpusets.txt.

 There are a number of different configurations you can use for your needs.  For
 more information on the numa=fake command line option and its various ways of
 configuring fake nodes, see Documentation/x86/x86_64/boot-options.txt.
 There are a number of different configurations you can use for your needs.  For
 more information on the numa=fake command line option and its various ways of
 configuring fake nodes, see Documentation/x86/x86_64/boot-options.txt.


@@ -32,7 +33,7 @@ A machine may be split as follows with "numa=fake=4*512," as reported by dmesg:
        On node 3 totalpages: 131072
 
 Now following the instructions for mounting the cpusets filesystem from
        On node 3 totalpages: 131072
 
 Now following the instructions for mounting the cpusets filesystem from

-Documentation/cpusets.txt, you can assign fake nodes (i.e. contiguous memory
+Documentation/cgroups/cpusets.txt, you can assign fake nodes (i.e. contiguous memory

 address spaces) to individual cpusets:
 
        [root@xroads /]# mkdir exampleset
 address spaces) to individual cpusets:
 
        [root@xroads /]# mkdir exampleset

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 499900d0cee7110748229ee3898b50734352e5e4..b837631fe49938e518ec14846878f497901cdc00 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -342,7 +342,10 @@ int cgroup_task_count(const struct cgroup *cgrp);
 /* Return true if the cgroup is a descendant of the current cgroup */
 int cgroup_is_descendant(const struct cgroup *cgrp);
 
 /* Return true if the cgroup is a descendant of the current cgroup */
 int cgroup_is_descendant(const struct cgroup *cgrp);
 

-/* Control Group subsystem type. See Documentation/cgroups.txt for details */
+/*
+ * Control Group subsystem type.
+ * See Documentation/cgroups/cgroups.txt for details
+ */

 
 struct cgroup_subsys {
        struct cgroup_subsys_state *(*create)(struct cgroup_subsys *ss,
 
 struct cgroup_subsys {
        struct cgroup_subsys_state *(*create)(struct cgroup_subsys *ss,

diff --git a/init/Kconfig b/init/Kconfig
index bcffc0e476477d3905bcbb92bee3ba882dd22ee5..99eb4196bd0a2720ff6ff8c76d7e1f46105019e1 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -565,7 +565,7 @@ config CGROUP_MEM_RES_CTLR
        select MM_OWNER
        help
          Provides a memory resource controller that manages both anonymous
        select MM_OWNER
        help
          Provides a memory resource controller that manages both anonymous

-         memory and page cache. (See Documentation/controllers/memory.txt)
+         memory and page cache. (See Documentation/cgroups/memory.txt)

 
          Note that setting this option increases fixed memory overhead
          associated with each page of memory in the system. By this,
 
          Note that setting this option increases fixed memory overhead
          associated with each page of memory in the system. By this,