diff options
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | kernel/cgroup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 64168f6dd89e..eecf3441ac21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1940,7 +1940,7 @@ F: drivers/connector/ | |||
1940 | 1940 | ||
1941 | CONTROL GROUPS (CGROUPS) | 1941 | CONTROL GROUPS (CGROUPS) |
1942 | M: Tejun Heo <tj@kernel.org> | 1942 | M: Tejun Heo <tj@kernel.org> |
1943 | M: Li Zefan <lizf@cn.fujitsu.com> | 1943 | M: Li Zefan <lizefan@huawei.com> |
1944 | L: containers@lists.linux-foundation.org | 1944 | L: containers@lists.linux-foundation.org |
1945 | L: cgroups@vger.kernel.org | 1945 | L: cgroups@vger.kernel.org |
1946 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git | 1946 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index f4ea4b6f3cf1..ed64ccac67c9 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -1883,7 +1883,7 @@ static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp, | |||
1883 | */ | 1883 | */ |
1884 | int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk) | 1884 | int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk) |
1885 | { | 1885 | { |
1886 | int retval; | 1886 | int retval = 0; |
1887 | struct cgroup_subsys *ss, *failed_ss = NULL; | 1887 | struct cgroup_subsys *ss, *failed_ss = NULL; |
1888 | struct cgroup *oldcgrp; | 1888 | struct cgroup *oldcgrp; |
1889 | struct cgroupfs_root *root = cgrp->root; | 1889 | struct cgroupfs_root *root = cgrp->root; |