The patch titled
Subject: mm/slab: Always predeclare slab_free()
has been added to the -mm tree. Its filename is
slab-recharge-slab-pages-to-the-allocating-memory-cgroup-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/slab-recharge-slab-pages-to-the-allocating-memory-cgroup-fix.patch
echo and later at
echo http://ozlabs.org/~akpm/mmotm/broken-out/slab-recharge-slab-pages-to-the-allocating-memory-cgroup-fix.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: Thierry Reding <treding@xxxxxxxxxx>
Subject: mm/slab: Always predeclare slab_free()
Commit 5da1c3c725ab ("slab: recharge slab pages to the allocating memory
cgroup") added a predeclaration of the new slab_free() helper so that it
can be used in slab_alloc_node() and slab_alloc(). However the prototype
is added in an #ifdef CONFIG_NUMA protected section of code, which works
fine for slab_alloc_node() but fails for slab_alloc().
Fixes the following build warnings and errors:
mm/slab.c: In function 'slab_alloc':
mm/slab.c:3260:4: error: implicit declaration of function 'slab_free' [-Werror=implicit-function-declaration]
slab_free(cachep, objp);
^
mm/slab.c: At top level:
mm/slab.c:3534:29: warning: conflicting types for 'slab_free'
static __always_inline void slab_free(struct kmem_cache *cachep, void *objp)
^
mm/slab.c:3534:29: error: static declaration of 'slab_free' follows non-static declaration
mm/slab.c:3260:4: note: previous implicit declaration of 'slab_free' was here
slab_free(cachep, objp);
^
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slab.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/slab.c~slab-recharge-slab-pages-to-the-allocating-memory-cgroup-fix mm/slab.c
--- a/mm/slab.c~slab-recharge-slab-pages-to-the-allocating-memory-cgroup-fix
+++ a/mm/slab.c
@@ -2961,6 +2961,8 @@ out:
return objp;
}
+static __always_inline void slab_free(struct kmem_cache *cachep, void *objp);
+
#ifdef CONFIG_NUMA
/*
* Try allocating on another node if PFA_SPREAD_SLAB is a mempolicy is set.
@@ -3133,8 +3135,6 @@ done:
return obj;
}
-static __always_inline void slab_free(struct kmem_cache *cachep, void *objp);
-
static __always_inline void *
slab_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
unsigned long caller)
_
Patches currently in -mm which might be from treding@xxxxxxxxxx are
slab-recharge-slab-pages-to-the-allocating-memory-cgroup-fix.patch
linux-next.patch
mm-cma-make-kmemleak-ignore-cma-regions.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
