diff options
| author | Tejun Heo <tj@kernel.org> | 2016-12-27 14:49:05 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-12-27 14:49:05 -0500 |
| commit | 201af4c0fab02876ef0311e7f7b4083aa138930c (patch) | |
| tree | d79bfd5f25c5fd111a79993bc10fc129281db225 /kernel | |
| parent | 5f617ebbdf10abd49312a89e3b894b927c7367f5 (diff) | |
| download | linux-201af4c0fab02876ef0311e7f7b4083aa138930c.tar.gz linux-201af4c0fab02876ef0311e7f7b4083aa138930c.tar.xz | |
cgroup: move cgroup files under kernel/cgroup/
They're growing to be too many and planned to get split further. Move
them under their own directory.
kernel/cgroup.c -> kernel/cgroup/cgroup.c
kernel/cgroup_freezer.c -> kernel/cgroup/freezer.c
kernel/cgroup_pids.c -> kernel/cgroup/pids.c
kernel/cpuset.c -> kernel/cgroup/cpuset.c
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Acked-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Makefile | 5 | ||||
| -rw-r--r-- | kernel/cgroup/Makefile | 5 | ||||
| -rw-r--r-- | kernel/cgroup/cgroup.c (renamed from kernel/cgroup.c) | 0 | ||||
| -rw-r--r-- | kernel/cgroup/cpuset.c (renamed from kernel/cpuset.c) | 0 | ||||
| -rw-r--r-- | kernel/cgroup/freezer.c (renamed from kernel/cgroup_freezer.c) | 0 | ||||
| -rw-r--r-- | kernel/cgroup/pids.c (renamed from kernel/cgroup_pids.c) | 0 |
6 files changed, 6 insertions, 4 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 12c679f769c6..b302b4731d16 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -64,10 +64,7 @@ obj-$(CONFIG_KEXEC) += kexec.o obj-$(CONFIG_KEXEC_FILE) += kexec_file.o obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o obj-$(CONFIG_COMPAT) += compat.o -obj-$(CONFIG_CGROUPS) += cgroup.o -obj-$(CONFIG_CGROUP_FREEZER) += cgroup_freezer.o -obj-$(CONFIG_CGROUP_PIDS) += cgroup_pids.o -obj-$(CONFIG_CPUSETS) += cpuset.o +obj-$(CONFIG_CGROUPS) += cgroup/ obj-$(CONFIG_UTS_NS) += utsname.o obj-$(CONFIG_USER_NS) += user_namespace.o obj-$(CONFIG_PID_NS) += pid_namespace.o diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile new file mode 100644 index 000000000000..4d561a50a5ac --- /dev/null +++ b/kernel/cgroup/Makefile @@ -0,0 +1,5 @@ +obj-y := cgroup.o + +obj-$(CONFIG_CGROUP_FREEZER) += freezer.o +obj-$(CONFIG_CGROUP_PIDS) += pids.o +obj-$(CONFIG_CPUSETS) += cpuset.o diff --git a/kernel/cgroup.c b/kernel/cgroup/cgroup.c index 1a815f275849..1a815f275849 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup/cgroup.c diff --git a/kernel/cpuset.c b/kernel/cgroup/cpuset.c index b3088886cd37..b3088886cd37 100644 --- a/kernel/cpuset.c +++ b/kernel/cgroup/cpuset.c diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup/freezer.c index 1b72d56edce5..1b72d56edce5 100644 --- a/kernel/cgroup_freezer.c +++ b/kernel/cgroup/freezer.c diff --git a/kernel/cgroup_pids.c b/kernel/cgroup/pids.c index 2bd673783f1a..2bd673783f1a 100644 --- a/kernel/cgroup_pids.c +++ b/kernel/cgroup/pids.c |