diff --git a/[refs] b/[refs] index f04a08da1d80..0f09bd0d2251 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad50c15919e8aca7ea30f9dcf4bac52448c9ab46 +refs/heads/master: 8f121918f2e49f852de1acdc5255cc1ef440d85b diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index f4ea4b6f3cf1..ed64ccac67c9 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -1883,7 +1883,7 @@ static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp, */ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk) { - int retval; + int retval = 0; struct cgroup_subsys *ss, *failed_ss = NULL; struct cgroup *oldcgrp; struct cgroupfs_root *root = cgrp->root;