Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index afea39eb7649ff358017e81288cfff5fa1b24ddf..86cb5c6e89320f28e17691c6d69e58c9dfde81fb 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1631,7 +1631,7 @@ static int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask)
 static int cgroup_show_path(struct seq_file *sf, struct kernfs_node *kf_node,
                            struct kernfs_root *kf_root)
 {
-       int len = 0, ret = 0;
+       int len = 0;
        char *buf = NULL;
        struct cgroup_root *kf_cgroot = cgroup_root_from_kf(kf_root);
        struct cgroup *ns_cgroup;