| Message ID | 1322051553-28987-1-git-send-email-nhorman@tuxdriver.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Nov 23, 2011 at 07:32:33AM -0500, Neil Horman wrote: > 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. Thanks Neil, now it compiles ok. -- 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
On Wed, Nov 23, 2011 at 05:11:47PM +0400, Kirill Smelkov wrote: > On Wed, Nov 23, 2011 at 07:32:33AM -0500, Neil Horman wrote: > > 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. > > Thanks Neil, now it compiles ok. > Np, sorry for the trouble. I should have double checked that make oldconfig did what I assumed it did Neil -- 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
From: Neil Horman <nhorman@tuxdriver.com> Date: Wed, 23 Nov 2011 07:32:33 -0500 > 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> Applied, thanks. -- 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/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h index c432e99..e503b87 100644 --- a/include/net/netprio_cgroup.h +++ b/include/net/netprio_cgroup.h @@ -18,11 +18,6 @@ #include <linux/hardirq.h> #include <linux/rcupdate.h> -struct cgroup_netprio_state -{ - struct cgroup_subsys_state css; - u32 prioidx; -}; struct netprio_map { struct rcu_head rcu; @@ -32,6 +27,11 @@ struct netprio_map { #ifdef CONFIG_CGROUPS +struct cgroup_netprio_state { + struct cgroup_subsys_state css; + u32 prioidx; +}; + #ifndef CONFIG_NETPRIO_CGROUP extern int net_prio_subsys_id; #endif @@ -52,14 +52,6 @@ static inline struct cgroup_netprio_state #else #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 /* _NET_CLS_CGROUP_H */
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> CC: Kirill Smelkov <kirr@mns.spb.ru> CC: "David S. Miller" <davem@davemloft.net> CC: john.r.fastabend@intel.com CC: robert.w.love@intel.com CC: Stephen Rothwell <sfr@canb.auug.org.au> CC: linux-next@vger.kernel.org --- include/net/netprio_cgroup.h | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-)