diff --git a/[refs] b/[refs] index f57862ebb6e0..1577327dc136 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12d15f0d51d47cec39d1d7250e81573c5cbd8b5d +refs/heads/master: 5c02b575780d0d785815a1e7b79a98edddee895a diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index fbc6fc8949b4..15ac0e1e4f4d 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -2903,7 +2903,7 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys) cg = tsk->cgroups; parent = task_cgroup(tsk, subsys->subsys_id); - snprintf(nodename, MAX_CGROUP_TYPE_NAMELEN, "node_%d", tsk->pid); + snprintf(nodename, MAX_CGROUP_TYPE_NAMELEN, "%d", tsk->pid); /* Pin the hierarchy */ atomic_inc(&parent->root->sb->s_active);