Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / net / sched / cls_cgroup.c

diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 907daf9..4a23ccc 100644 (file)
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -77,9 +77,7 @@ struct cgroup_subsys net_cls_subsys = {
        .name           = "net_cls",
        .create         = cgrp_create,
        .destroy        = cgrp_destroy,
-#ifdef CONFIG_NET_CLS_CGROUP
        .subsys_id      = net_cls_subsys_id,
-#endif
        .base_cftypes   = ss_files,
        .module         = THIS_MODULE,
 
@@ -292,12 +290,6 @@ static int __init init_cgroup_cls(void)
        if (ret)
                goto out;
 
-#ifndef CONFIG_NET_CLS_CGROUP
-       /* We can't use rcu_assign_pointer because this is an int. */
-       smp_wmb();
-       net_cls_subsys_id = net_cls_subsys.subsys_id;
-#endif
-
        ret = register_tcf_proto_ops(&cls_cgroup_ops);
        if (ret)
                cgroup_unload_subsys(&net_cls_subsys);
@@ -310,11 +302,6 @@ static void __exit exit_cgroup_cls(void)
 {
        unregister_tcf_proto_ops(&cls_cgroup_ops);
 
-#ifndef CONFIG_NET_CLS_CGROUP
-       net_cls_subsys_id = -1;
-       synchronize_rcu();
-#endif
-
        cgroup_unload_subsys(&net_cls_subsys);
 }