Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55935a34 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] More slab.h cleanups 



More cleanups for slab.h

1. Remove tabs from weird locations as suggested by Pekka

2. Drop the check for NUMA and SLAB_DEBUG from the fallback section
   as suggested by Pekka.

3. Uses static inline for the fallback defs as also suggested by Pekka.

4. Make kmem_ptr_valid take a const * argument.

5. Separate the NUMA fallback definitions from the kmalloc_track fallback
   definitions.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2e892f43

include/linux/slab.h

+24 −20
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void *kmem_cache_zalloc(struct kmem_cache *, gfp_t); 
void kmem_cache_free(struct kmem_cache *, void *);

unsigned int kmem_cache_size(struct kmem_cache *);

const char *kmem_cache_name(struct kmem_cache *);

int kmem_ptr_validate(struct kmem_cache *cachep, void *ptr);

int kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr);



#ifdef CONFIG_NUMA

extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
@@ -93,19 +93,15 @@ static inline void *kcalloc(size_t n, size_t size, gfp_t flags) 
 * ways to convert kmalloc() calls to kmem_cache_alloc() invocations by selecting

 * the appropriate general cache at compile time.

 */



#ifdef CONFIG_SLAB

#include <linux/slab_def.h>

#else



/*

 * Fallback definitions for an allocator not wanting to provide

 * its own optimized kmalloc definitions (like SLOB).

 */



#if defined(CONFIG_NUMA) || defined(CONFIG_DEBUG_SLAB)

#error "SLAB fallback definitions not usable for NUMA or Slab debug"

#endif



/**

 * kmalloc - allocate memory

 * @size: how many bytes of memory are required.
@@ -151,7 +147,7 @@ static inline void *kcalloc(size_t n, size_t size, gfp_t flags) 
 *

 * %__GFP_REPEAT - If allocation fails initially, try once more before failing.

 */

void *kmalloc(size_t size, gfp_t flags)

static inline void *kmalloc(size_t size, gfp_t flags)

{

	return __kmalloc(size, flags);

}
@@ -161,12 +157,24 @@ void *kmalloc(size_t size, gfp_t flags) 
 * @size: how many bytes of memory are required.

 * @flags: the type of memory to allocate (see kmalloc).

 */

void *kzalloc(size_t size, gfp_t flags)

static inline void *kzalloc(size_t size, gfp_t flags)

{

	return __kzalloc(size, flags);

}

#endif



#ifndef CONFIG_NUMA

static inline void *kmalloc_node(size_t size, gfp_t flags, int node)

{

	return kmalloc(size, flags);

}



static inline void *__kmalloc_node(size_t size, gfp_t flags, int node)

{

	return __kmalloc(size, flags);

}

#endif /* !CONFIG_NUMA */



/*

 * kmalloc_track_caller is a special version of kmalloc that records the

 * calling function of the routine calling it for slab leak tracking instead
@@ -208,12 +216,8 @@ extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *); 
#define kmalloc_node_track_caller(size, flags, node) \

	kmalloc_track_caller(size, flags)



static inline void *kmalloc_node(size_t size, gfp_t flags, int node)

{

	return kmalloc(size, flags);

}

#endif /* DEBUG_SLAB */



#endif /* !CONFIG_NUMA */

#endif	/* __KERNEL__ */

#endif	/* _LINUX_SLAB_H */

mm/slab.c

+1 −1
Original line number Diff line number Diff line
@@ -3541,7 +3541,7 @@ EXPORT_SYMBOL(kmem_cache_zalloc); 
 *

 * Currently only used for dentry validation.

 */

int fastcall kmem_ptr_validate(struct kmem_cache *cachep, void *ptr)

int fastcall kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr)

{

	unsigned long addr = (unsigned long)ptr;

	unsigned long min_addr = PAGE_OFFSET;

mm/slob.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ int kmem_cache_shrink(struct kmem_cache *d) 
}

EXPORT_SYMBOL(kmem_cache_shrink);



int kmem_ptr_validate(struct kmem_cache *a, void *b)

int kmem_ptr_validate(struct kmem_cache *a, const void *b)

{

	return 0;

}