Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936578AbcLTVLA (ORCPT ); Tue, 20 Dec 2016 16:11:00 -0500 Received: from mail-yw0-f195.google.com ([209.85.161.195]:36139 "EHLO mail-yw0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758047AbcLTVIj (ORCPT ); Tue, 20 Dec 2016 16:08:39 -0500 From: Tejun Heo To: lizefan@huawei.com, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, kernel-team@fb.com, Tejun Heo Subject: [PATCH 2/8] cgroup: move cgroup files under kernel/cgroup/ Date: Tue, 20 Dec 2016 16:08:21 -0500 Message-Id: <20161220210827.11176-3-tj@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161220210827.11176-1-tj@kernel.org> References: <20161220210827.11176-1-tj@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2453 Lines: 68 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 --- 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