From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx129.postini.com [74.125.245.129]) by kanga.kvack.org (Postfix) with SMTP id 6A1DF6B0031 for ; Wed, 3 Jul 2013 08:49:58 -0400 (EDT) Received: by mail-bk0-f41.google.com with SMTP id jc3so51196bkc.14 for ; Wed, 03 Jul 2013 05:49:56 -0700 (PDT) From: Sedat Dilek Subject: [PATCH next-20130703] net: sock: Add ifdef CONFIG_MEMCG_KMEM for mem_cgroup_sockets_{init,destroy} Date: Wed, 3 Jul 2013 14:49:46 +0200 Message-Id: <1372855786-15597-1-git-send-email-sedat.dilek@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Li Zefan , Andrew Morton , linux-next@vger.kernel.org, Stephen Rothwell , linux-mm , Sergei Shtylyov Cc: Sedat Dilek When "CONFIG_MEMCG_KMEM=n" I see this in my build-log: LD init/built-in.o mm/built-in.o: In function `mem_cgroup_css_free': memcontrol.c:(.text+0x5caa6): undefined reference to `mem_cgroup_sockets_destroy' make[2]: *** [vmlinux] Error 1 Inspired by the ifdef for mem_cgroup_sockets_{init,destroy} here... [ net/core/sock.c ] #ifdef CONFIG_MEMCG_KMEM int mem_cgroup_sockets_init() ... void mem_cgroup_sockets_destroy() ... #endif ...I did the the same for both in "include/net/sock.h". This fixes the issue for me in next-20130703. Signed-off-by: Sedat Dilek --- v3: Mixed up the order of comments: CONFIG_NET should come last. (Thanks Sergei Shtylyov) v2: git dislikes lines beginning with hash ('#') in the changelog. Signed-off-by: Sedat Dilek --- include/net/sock.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/net/sock.h b/include/net/sock.h index ea6206c..37d2374 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -71,6 +71,7 @@ struct cgroup; struct cgroup_subsys; #ifdef CONFIG_NET +#ifdef CONFIG_MEMCG_KMEM int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss); void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg); #else @@ -83,7 +84,8 @@ static inline void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg) { } -#endif +#endif /* CONFIG_MEMCG_KMEM */ +#endif /* CONFIG_NET */ /* * This structure really needs to be cleaned up. * Most of it is for TCP, and not used by any of -- 1.8.3.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org