The patch titled
Subject: netprio_cgroup: fix build break
has been added to the -mm tree. Its filename is
netprio_cgroup-fix-build-break.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Neil Horman <nhorman@xxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxx>
Cc: Kirill Smelkov <kirr@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: John Fastabend <john.r.fastabend@xxxxxxxxx>
Cc: Robert Love <robert.w.love@xxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/net/netprio_cgroup.h | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff -puN include/net/netprio_cgroup.h~netprio_cgroup-fix-build-break include/net/netprio_cgroup.h
--- a/include/net/netprio_cgroup.h~netprio_cgroup-fix-build-break
+++ a/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_stat
#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 */
_
Subject: Subject: netprio_cgroup: fix build break
Patches currently in -mm which might be from nhorman@xxxxxxxxxxxxx are
linux-next.patch
netprio_cgroup-fix-build-break.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
