Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-3.10.git] / net / core / netprio_cgroup.c
index 34f3615..39e7e4d 100644 (file)
@@ -326,9 +326,7 @@ struct cgroup_subsys net_prio_subsys = {
        .create         = cgrp_create,
        .destroy        = cgrp_destroy,
        .attach         = net_prio_attach,
-#ifdef CONFIG_NETPRIO_CGROUP
        .subsys_id      = net_prio_subsys_id,
-#endif
        .base_cftypes   = ss_files,
        .module         = THIS_MODULE,
 
@@ -376,10 +374,6 @@ static int __init init_cgroup_netprio(void)
        ret = cgroup_load_subsys(&net_prio_subsys);
        if (ret)
                goto out;
-#ifndef CONFIG_NETPRIO_CGROUP
-       smp_wmb();
-       net_prio_subsys_id = net_prio_subsys.subsys_id;
-#endif
 
        register_netdevice_notifier(&netprio_device_notifier);
 
@@ -396,11 +390,6 @@ static void __exit exit_cgroup_netprio(void)
 
        cgroup_unload_subsys(&net_prio_subsys);
 
-#ifndef CONFIG_NETPRIO_CGROUP
-       net_prio_subsys_id = -1;
-       synchronize_rcu();
-#endif
-
        rtnl_lock();
        for_each_netdev(&init_net, dev) {
                old = rtnl_dereference(dev->priomap);