Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1294917 > unrolled thread

[PATCH] memcg: fix SLOB build regression

Back to article view | Back to linux.kernel

Contents

  [PATCH] memcg: fix SLOB build regression Arnd Bergmann <arnd@arndb.de> - 2015-12-18 15:40 +0100
    Re: [PATCH] memcg: fix SLOB build regression Johannes Weiner <hannes@cmpxchg.org> - 2015-12-18 17:50 +0100

#1294917 — [PATCH] memcg: fix SLOB build regression

A recent cleanup broke the build when CONFIG_SLOB is used:

mm/memcontrol.c: In function 'memcg_update_kmem_limit':
mm/memcontrol.c:2974:9: error: implicit declaration of function 'memcg_online_kmem' [-Werror=implicit-function-declaration]
mm/memcontrol.c: In function 'mem_cgroup_css_alloc':
mm/memcontrol.c:4229:10: error: too many arguments to function 'memcg_propagate_kmem'
mm/memcontrol.c:2949:12: note: declared here

This fixes the memcg_propagate_kmem prototype to match the normal
implementation and adds the respective memcg_online_kmem helper
function that was needed.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: a5ed904c5039 ("mm: memcontrol: clean up alloc, online, offline, free functions")
---
This just showed up on ARM randconfig builds with linux-next, please apply
or fold into the original patch

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 48b22c3545b1..4637199e69d6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2946,7 +2946,11 @@ static void memcg_free_kmem(struct mem_cgroup *memcg)
 	}
 }
 #else
-static int memcg_propagate_kmem(struct mem_cgroup *memcg)
+static int memcg_propagate_kmem(struct mem_cgroup *parent, struct mem_cgroup *memcg)
+{
+	return 0;
+}
+static int memcg_online_kmem(struct mem_cgroup *memcg)
 {
 	return 0;
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1295031

On Fri, Dec 18, 2015 at 03:35:06PM +0100, Arnd Bergmann wrote:
> A recent cleanup broke the build when CONFIG_SLOB is used:
> 
> mm/memcontrol.c: In function 'memcg_update_kmem_limit':
> mm/memcontrol.c:2974:9: error: implicit declaration of function 'memcg_online_kmem' [-Werror=implicit-function-declaration]
> mm/memcontrol.c: In function 'mem_cgroup_css_alloc':
> mm/memcontrol.c:4229:10: error: too many arguments to function 'memcg_propagate_kmem'
> mm/memcontrol.c:2949:12: note: declared here
> 
> This fixes the memcg_propagate_kmem prototype to match the normal
> implementation and adds the respective memcg_online_kmem helper
> function that was needed.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: a5ed904c5039 ("mm: memcontrol: clean up alloc, online, offline, free functions")

I am slob.

Acked-by: Johannes Weiner <hannes@cmpxchg.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web