net: revert "sched classifier: make cgroup table local"
authorCong Wang <xiyou.wangcong@gmail.com>
Thu, 2 Jan 2014 22:58:41 +0000 (14:58 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Jan 2014 00:02:12 +0000 (19:02 -0500)
This reverts commit de6fb288b1246a5c4e00c0cdbfe3a838a360b3f4.
Otherwise we got:

net/sched/cls_cgroup.c:106:29: error: static declaration of ‘net_cls_subsys’ follows non-static declaration
 static struct cgroup_subsys net_cls_subsys = {
                             ^
In file included from include/linux/cgroup.h:654:0,
                 from net/sched/cls_cgroup.c:18:
include/linux/cgroup_subsys.h:35:29: note: previous declaration of ‘net_cls_subsys’ was here
 SUBSYS(net_cls)
                             ^
make[2]: *** [net/sched/cls_cgroup.o] Error 1

Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/cls_cgroup.c

index 161a03e0c002d7b15b6a57fa271e7e2c8968bf64..f9d212583ea2a3f9d4bf4f30df6a0b3c9ecd5036 100644 (file)
@@ -103,7 +103,7 @@ static struct cftype ss_files[] = {
        { }     /* terminate */
 };
 
-static struct cgroup_subsys net_cls_subsys = {
+struct cgroup_subsys net_cls_subsys = {
        .name           = "net_cls",
        .css_alloc      = cgrp_css_alloc,
        .css_online     = cgrp_css_online,