The patch titled Subject: memcg: fix mm/memcontrol.c build error against linux-next has been added to the -mm tree. Its filename is memcg-add-mem_cgroup_from_css-helper-fix-2.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Subject: memcg: fix mm/memcontrol.c build error against linux-next As Fengguang Wu reported, linux-next failed to build with tree: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git akpm head: 37e2ad4953983527f7bdb6831bf478eedcc84082 commit: 442d53f161093de78f0aafcd3ec2a6345de42890 [164/309] memcg: add mem_cgroup_from_css() helper mem_cgroup_from_css() is defined inside CONFIG_MEMCG_KMEM and used outside of it, move mem_cgroup_from_css() out of the #ifdef CONFIG_MEMCG_KMEM can address this issue. Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx> Reported-by: Seth Jennings <sjenning@xxxxxxxxxxxxxxxxxx> Signed-off-by: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Cc: Gavin Shan <shangw@xxxxxxxxxxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN mm/memcontrol.c~memcg-add-mem_cgroup_from_css-helper-fix-2 mm/memcontrol.c --- a/mm/memcontrol.c~memcg-add-mem_cgroup_from_css-helper-fix-2 +++ a/mm/memcontrol.c @@ -405,17 +405,17 @@ enum charge_type { static void mem_cgroup_get(struct mem_cgroup *memcg); static void mem_cgroup_put(struct mem_cgroup *memcg); -/* Writing them here to avoid exposing memcg's inner layout */ -#ifdef CONFIG_MEMCG_KMEM -#include <net/sock.h> -#include <net/ip.h> - static inline struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) { return container_of(s, struct mem_cgroup, css); } +/* Writing them here to avoid exposing memcg's inner layout */ +#ifdef CONFIG_MEMCG_KMEM +#include <net/sock.h> +#include <net/ip.h> + static bool mem_cgroup_is_root(struct mem_cgroup *memcg); void sock_update_memcg(struct sock *sk) { _ Subject: Subject: memcg: fix mm/memcontrol.c build error against linux-next Patches currently in -mm which might be from liwanp@xxxxxxxxxxxxxxxxxx are memcg-add-mem_cgroup_from_css-helper.patch memcg-add-mem_cgroup_from_css-helper-fix.patch memcg-add-mem_cgroup_from_css-helper-fix-2.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