Messages in this thread Patch in this message | | | Date | Wed, 18 Jul 2007 09:18:36 +0900 | From | Paul Mundt <> | Subject | Re: 2.6.23 compile failure - slab/slob interspanking |
| |
On Tue, Jul 17, 2007 at 10:00:08PM +0200, Jan Engelhardt wrote: > 81cda6626178cd55297831296ba8ecedbfd8b52d is first bad commit > commit 81cda6626178cd55297831296ba8ecedbfd8b52d > Author: Christoph Lameter <clameter@sgi.com> > Date: Tue Jul 17 04:03:29 2007 -0700 > > Slab allocators: Cleanup zeroing allocations > > It becomes now easy to support the zeroing allocs with generic inline > functions in slab.h. Provide inline definitions to allow the continued use of > kzalloc, kmem_cache_zalloc etc but remove other definitions of zeroing > functions from the slab allocators and util.c. > > Signed-off-by: Christoph Lameter <clameter@sgi.com> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> > This fixes it for me with your .config:
slob: Kill off duplicate kzalloc() definition.
With the slab zeroing allocations cleanups Christoph stubbed in a generic kzalloc(), which was missed on SLOB. Follow the SLAB/SLUB changes and kill off the __kzalloc() wrapper that SLOB was using.
Reported-by: Jan Engelhardt <jengelh@computergmbh.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
--
include/linux/slob_def.h | 10 ---------- 1 file changed, 10 deletions(-)
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h index a2daf2d..59a3fa4 100644 --- a/include/linux/slob_def.h +++ b/include/linux/slob_def.h @@ -33,14 +33,4 @@ static inline void *__kmalloc(size_t size, gfp_t flags) return kmalloc(size, flags); } -/** - * kzalloc - allocate memory. The memory is set to zero. - * @size: how many bytes of memory are required. - * @flags: the type of memory to allocate (see kcalloc). - */ -static inline void *kzalloc(size_t size, gfp_t flags) -{ - return __kzalloc(size, flags); -} - #endif /* __LINUX_SLOB_DEF_H */ - 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/
| |