From 201af4c0fab02876ef0311e7f7b4083aa138930c Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 27 Dec 2016 14:49:05 -0500 Subject: [PATCH] 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 Acked-by: Acked-by: Zefan Li --- kernel/Makefile | 5 +---- kernel/cgroup/Makefile | 5 +++++ kernel/{ => cgroup}/cgroup.c | 0 kernel/{ => cgroup}/cpuset.c | 0 kernel/{cgroup_freezer.c => cgroup/freezer.c} | 0 kernel/{cgroup_pids.c => cgroup/pids.c} | 0 6 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 kernel/cgroup/Makefile rename kernel/{ => cgroup}/cgroup.c (100%) rename kernel/{ => cgroup}/cpuset.c (100%) rename kernel/{cgroup_freezer.c => cgroup/freezer.c} (100%) rename kernel/{cgroup_pids.c => cgroup/pids.c} (100%) 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 similarity index 100% rename from kernel/cgroup.c rename to kernel/cgroup/cgroup.c diff --git a/kernel/cpuset.c b/kernel/cgroup/cpuset.c similarity index 100% rename from kernel/cpuset.c rename to kernel/cgroup/cpuset.c diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup/freezer.c similarity index 100% rename from kernel/cgroup_freezer.c rename to kernel/cgroup/freezer.c diff --git a/kernel/cgroup_pids.c b/kernel/cgroup/pids.c similarity index 100% rename from kernel/cgroup_pids.c rename to kernel/cgroup/pids.c -- 2.45.2