diff options
| author |   John Fastabend <john.r.fastabend@intel.com> | 2011-12-09 13:39:27 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-12-09 13:39:27 -0500 |
| commit | 0221cd51543972782af558c527e4ac58b32049fa (patch) | |
| tree | 6d692f21ef937dc3febdd11ec871c03eecb84d46 /net | |
| parent | sock_diag: off by one checks (diff) | |
| download | linux-dev-0221cd51543972782af558c527e4ac58b32049fa.tar.xz linux-dev-0221cd51543972782af558c527e4ac58b32049fa.zip | |
Revert "net: netprio_cgroup: make net_prio_subsys static"
This reverts commit 865d9f9f748fdc1943679ea65d9ee1dc55e4a6ae.
This commit breaks the build with CONFIG_NETPRIO_CGROUP=y so
revert it. It does build as a module though. The SUBSYS macro
in the cgroup core code automatically defines a subsys structure
as extern. Long term we should fix the macro. And I need to
fully build test things.
Tested with CONFIG_NETPRIO_CGROUP={y|m|n} with and without
CONFIG_CGROUPS defined.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
CC: Neil Horman <nhorman@tuxdriver.com>
Reported-By: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/netprio_cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c index ea16c8faf20c..3a9fd4826b75 100644 --- a/net/core/netprio_cgroup.c +++ b/net/core/netprio_cgroup.c @@ -28,7 +28,7 @@ static struct cgroup_subsys_state *cgrp_create(struct cgroup_subsys *ss, static void cgrp_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp); static int cgrp_populate(struct cgroup_subsys *ss, struct cgroup *cgrp); -static struct cgroup_subsys net_prio_subsys = { +struct cgroup_subsys net_prio_subsys = { .name = "net_prio", .create = cgrp_create, .destroy = cgrp_destroy, |