From cb32da0416b823b7f4b65e7e85d6cba16ca4d1e1 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 18 Jul 2007 09:18:36 +0900 Subject: [PATCH] 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 Signed-off-by: Paul Mundt Signed-off-by: Linus Torvalds --- 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 a2daf2d418a9d..59a3fa476ab9f 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 */