Re: linux-next: Tree for Jul 3 [ BROKEN: memcontrol.c:(.text+0x5caa6): undefined reference to `mem_cgroup_sockets_destroy' ]

[Sedat Dilek <sedat.dilek@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1507 bytes --]

On Wed, Jul 3, 2013 at 11:29 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> On Wed, Jul 3, 2013 at 10:06 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Changes since 20130702:
>>
>> The powerpc tree lost its build failure.
>>
>> The device-mapper tree gained a conflict against the md tree.
>>
>> The net-next tree gained a build failure for which I cherry-picked an
>> upcoming fix.
>>
>> The trivial tree gained conflicts against the btrfs and Linus' trees.
>>
>> The xen-two tree gained a conflict against the tip tree.
>>
>> The akpm tree lost some patches that turned up elsewhere.
>>
>> The cpuinit tree lost a patch that turned up elsewhere.
>>
>> ----------------------------------------------------------------------------
>>
>
> From my build-log:
> ...
>  CC      mm/memcontrol.o
> ...
>   MODPOST vmlinux.o
> WARNING: modpost: Found 1 section mismatch(es).
> To see full details build your kernel with:
> 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
>   GEN     .version
>   CHK     include/generated/compile.h
>   UPD     include/generated/compile.h
>   CC      init/version.o
>   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
> make[1]: *** [deb-pkg] Error 2
> make: *** [deb-pkg] Error 2
>
> My kernel-config is attached.
>

[ CC linux-mm and Li Zefan ]

Trying with the attached patch... Building...

- Sedat -


> - Sedat -

[-- Attachment #2: 0001-memcg-Fix-build-failure-in-mem_cgroup_css_free.patch --]
[-- Type: application/octet-stream, Size: 1470 bytes --]

From 3e7859206c8298b58779a6e200747ae48a02149c Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@gmail.com>
Date: Wed, 3 Jul 2013 12:45:40 +0200
Subject: [PATCH next-20130703] memcg: Fix build failure in
 mem_cgroup_css_free()

From my build-log for next-20130703:
...
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

commit 49f2b6beb428 ("memcg: use css_get/put when charging/uncharging kmem")
renamed kmem_cgroup_destroy() to kmem_cgroup_css_offline().

-static void kmem_cgroup_destroy(struct mem_cgroup *memcg)
+static void kmem_cgroup_css_offline(struct mem_cgroup *memcg)

Whereas in mem_cgroup_css_free() I see this:

- kmem_cgroup_destroy(memcg);
+ mem_cgroup_sockets_destroy(memcg);

This should be IMHO:

+ kmem_cgroup_css_offlinememcg);

I am not sure if this was intended and speculate this is a typo.

This patch tries to fix the issue.

Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
 mm/memcontrol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d6a3e56..ca8d985 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6332,7 +6332,7 @@ static void mem_cgroup_css_free(struct cgroup *cont)
 {
 	struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
 
-	mem_cgroup_sockets_destroy(memcg);
+	mem_cgroup_css_offline(memcg);
 
 	__mem_cgroup_free(memcg);
 }
-- 
1.8.3.2