Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8c2152286aabe753519d7627a2992625b97e4b20

Authored by Neil Horman
Committed by David S. Miller
1 parent 1f2149c1df
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

netprio_cgroup: Fix build break 

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>

Showing 1 changed file with 5 additions and 13 deletions Side-by-side Diff

include/net/netprio_cgroup.h
Diff comments   View file @ 8c21522
... ... @@ -18,11 +18,6 @@
18 18 #include <linux/hardirq.h>
19 19 #include <linux/rcupdate.h>
20 20  
21   -struct cgroup_netprio_state
22   -{
23   - struct cgroup_subsys_state css;
24   - u32 prioidx;
25   -};
26 21  
27 22 struct netprio_map {
28 23 struct rcu_head rcu;
... ... @@ -32,6 +27,11 @@
32 27  
33 28 #ifdef CONFIG_CGROUPS
34 29  
  30 +struct cgroup_netprio_state {
  31 + struct cgroup_subsys_state css;
  32 + u32 prioidx;
  33 +};
  34 +
35 35 #ifndef CONFIG_NETPRIO_CGROUP
36 36 extern int net_prio_subsys_id;
37 37 #endif
... ... @@ -52,14 +52,6 @@
52 52 #else
53 53  
54 54 #define sock_update_netprioidx(sk)
55   -#define skb_update_prio(skb)
56   -
57   -static inline struct cgroup_netprio_state
58   - *task_netprio_state(struct task_struct *p)
59   -{
60   - return NULL;
61   -}
62   -
63 55 #endif
64 56  
65 57 #endif /* _NET_CLS_CGROUP_H */