| Message ID | 1388703521-5535-1-git-send-email-xiyou.wangcong@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Cong Wang <xiyou.wangcong@gmail.com> Date: Thu, 2 Jan 2014 14:58:41 -0800 > 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> This is so damn unintuitive, and that build error only occurs if you build cls_cgroup statically. Applied, but the way this works is terrible.
On Thu, 02 Jan 2014 19:03:23 -0500 (EST) David Miller <davem@davemloft.net> wrote: > From: Cong Wang <xiyou.wangcong@gmail.com> > Date: Thu, 2 Jan 2014 14:58:41 -0800 > > > 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> > > This is so damn unintuitive, and that build error only occurs if you > build cls_cgroup statically. > > Applied, but the way this works is terrible. Just removing from the include file is probably enough to fix it. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 161a03e..f9d21258 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,
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> --- net/sched/cls_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)