aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2014-01-02 14:58:41 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-02 19:02:12 -0500
commitc1ddf295f5183a5189196a8035546842caa2055a (patch)
treee2e6c4ead9ba8b736a9c78f2c918850f76e6befc /net
parentsched classifier: make cgroup table local (diff)
downloadlinux-dev-c1ddf295f5183a5189196a8035546842caa2055a.tar.xz
linux-dev-c1ddf295f5183a5189196a8035546842caa2055a.zip
net: revert "sched classifier: make cgroup table local"
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>
Diffstat (limited to 'net')
-rw-r--r--net/sched/cls_cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 161a03e0c002..f9d212583ea2 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -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,