Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1545479

[PATCH 2/8] cgroup: move cgroup files under kernel/cgroup/

Show all headers | View raw

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>
---
 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 12c679f..b302b47 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 0000000..4d561a5
--- /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.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHSET] cgroup: reorganize cgroup source files Tejun Heo <tj@kernel.org> - 2016-12-20 22:10 +0100
  [PATCH 1/8] cgroup: reorder css_set fields Tejun Heo <tj@kernel.org> - 2016-12-20 22:10 +0100
  [PATCH 7/8] cgroup: rename functions for consistency Tejun Heo <tj@kernel.org> - 2016-12-20 22:10 +0100
  [PATCH 2/8] cgroup: move cgroup files under kernel/cgroup/ Tejun Heo <tj@kernel.org> - 2016-12-20 22:20 +0100
  [PATCH 8/8] cgroup: move namespace code to kernel/cgroup/namespace.c Tejun Heo <tj@kernel.org> - 2016-12-20 22:20 +0100
  [PATCH 5/8] cgroup: separate out cgroup1_kf_syscall_ops Tejun Heo <tj@kernel.org> - 2016-12-20 22:20 +0100
  [PATCH 4/8] cgroup: refactor mount path and clearly distinguish v1 and v2 paths Tejun Heo <tj@kernel.org> - 2016-12-20 22:20 +0100
  [PATCH 9/8] cgroup: fix RCU related sparse warnings Tejun Heo <tj@kernel.org> - 2016-12-22 18:30 +0100
  Re: [PATCHSET] cgroup: reorganize cgroup source files Zefan Li <lizefan@huawei.com> - 2016-12-26 07:30 +0100
  Re: [PATCHSET] cgroup: reorganize cgroup source files Tejun Heo <tj@kernel.org> - 2016-12-27 21:10 +0100

csiph-web