AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

netprio_cgroup: Fix build break

Browse Source 
I broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS=n.
This patch corrects it by moving the offending struct into an ifdef
CONFIG_CGROUPS block.  Also clean up a few needless defines and inline functions
that don't get called if CONFIG_CGROUPS isn't defined while Im at it.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Neil Horman 2011-11-23 15:52:58 -05:00 committed by David S. Miller
parent 1f2149c1df
commit 8c2152286a
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/net/netprio_cgroup.h
View File

@ -18,11 +18,6 @@
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
struct cgroup_netprio_state
{
struct cgroup_subsys_state css;
u32 prioidx;
};
struct netprio_map { struct netprio_map {
struct rcu_head rcu; struct rcu_head rcu;
@ -32,6 +27,11 @@ struct netprio_map {
#ifdef CONFIG_CGROUPS #ifdef CONFIG_CGROUPS
struct cgroup_netprio_state {
struct cgroup_subsys_state css;
u32 prioidx;
};
#ifndef CONFIG_NETPRIO_CGROUP #ifndef CONFIG_NETPRIO_CGROUP
extern int net_prio_subsys_id; extern int net_prio_subsys_id;
#endif #endif
@ -52,14 +52,6 @@ static inline struct cgroup_netprio_state
#else #else
#define sock_update_netprioidx(sk) #define sock_update_netprioidx(sk)
#define skb_update_prio(skb)
static inline struct cgroup_netprio_state
*task_netprio_state(struct task_struct *p)
{
return NULL;
}
#endif #endif
#endif /* _NET_CLS_CGROUP_H */ #endif /* _NET_CLS_CGROUP_H */