linux-next: build failure after merge of the final tree (slab tree related)

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:

In file included from include/linux/xattr.h:14:0,
                 from include/linux/cgroup.h:21,
                 from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:8,
                 from include/linux/suspend.h:4,
                 from arch/powerpc/kernel/asm-offsets.c:24:
include/linux/slab.h:587:21: error: redefinition of 'kmalloc_node'
 static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
                     ^
include/linux/slab.h:429:30: note: previous definition of 'kmalloc_node' was here
 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
                              ^
include/linux/slab.h:592:21: error: redefinition of '__kmalloc_node'
 static inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
                     ^
In file included from include/linux/xattr.h:14:0,
                 from include/linux/cgroup.h:21,
                 from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:8,
                 from include/linux/suspend.h:4,
                 from arch/powerpc/kernel/asm-offsets.c:24:
include/linux/slab.h:302:30: note: previous definition of '__kmalloc_node' was here
 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
                              ^
In file included from include/linux/xattr.h:14:0,
                 from include/linux/cgroup.h:21,
                 from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:8,
                 from include/linux/suspend.h:4,
                 from arch/powerpc/kernel/asm-offsets.c:24:
include/linux/slab.h:599:21: error: redefinition of 'kmem_cache_alloc_node'
 static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
                     ^
In file included from include/linux/xattr.h:14:0,
                 from include/linux/cgroup.h:21,
                 from include/linux/memcontrol.h:22,
                 from include/linux/swap.h:8,
                 from include/linux/suspend.h:4,
                 from arch/powerpc/kernel/asm-offsets.c:24:
include/linux/slab.h:307:30: note: previous definition of 'kmem_cache_alloc_node' was here
 static __always_inline void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t flags, int node)
                              ^

Probably caused by commit 1a1d0328975f ("mm/sl[aou]b: Move kmalloc_node
functions to common code") from the slab tree.

This build has CONFIG_NUMA and CONFIG_SLOB undefined.

I have reverted that commit and commits eab6f38ab23c ("mm/sl[aou]b: Move
kmalloc definitions to slab.h"), c8f12ea82f92 ("sl[aou]b: Remove
unnecessary #includes") and 8876832d0466 ("slub: remove
verify_mem_not_deleted()") that followed it.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpIm4OvXlWK2.pgp
Description: PGP signature