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

Commit 9425c58e authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

slab: Common definition for the array of kmalloc caches 



Have a common definition fo the kmalloc cache arrays in
SLAB and SLUB

Acked-by: default avatarGlauber Costa <glommer@parallels.com>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 95a05b42

include/linux/slab.h

+5 −0
Original line number Diff line number Diff line
@@ -206,6 +206,11 @@ struct kmem_cache { 
#define KMALLOC_MIN_SIZE (1 << KMALLOC_SHIFT_LOW)

#endif



extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];

#ifdef CONFIG_ZONE_DMA

extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];

#endif



/*

 * Figure out which kmalloc slab an allocation of a certain size

 * belongs to.

include/linux/slab_def.h

+0 −3
Original line number Diff line number Diff line
@@ -102,9 +102,6 @@ struct kmem_cache { 
	 */

};



extern struct kmem_cache *kmalloc_caches[PAGE_SHIFT + MAX_ORDER];

extern struct kmem_cache *kmalloc_dma_caches[PAGE_SHIFT + MAX_ORDER];



void *kmem_cache_alloc(struct kmem_cache *, gfp_t);

void *__kmalloc(size_t size, gfp_t flags);

include/linux/slub_def.h

+0 −6
Original line number Diff line number Diff line
@@ -122,12 +122,6 @@ struct kmem_cache { 
#define SLUB_DMA (__force gfp_t)0

#endif



/*

 * We keep the general caches in an array of slab caches that are used for

 * 2^x bytes of allocations.

 */

extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];



/*

 * Find the slab cache for a given combination of allocation flags and size.

 *

mm/slab.c

+0 −8
Original line number Diff line number Diff line
@@ -318,14 +318,6 @@ static void free_block(struct kmem_cache *cachep, void **objpp, int len, 
static int enable_cpucache(struct kmem_cache *cachep, gfp_t gfp);

static void cache_reap(struct work_struct *unused);



struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];

EXPORT_SYMBOL(kmalloc_caches);



#ifdef CONFIG_ZONE_DMA

struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];

EXPORT_SYMBOL(kmalloc_dma_caches);

#endif



static int slab_early_init = 1;



#define INDEX_AC kmalloc_index(sizeof(struct arraycache_init))

mm/slab_common.c

+8 −0
Original line number Diff line number Diff line
@@ -319,6 +319,14 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size, 
	return s;

}



struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];

EXPORT_SYMBOL(kmalloc_caches);



#ifdef CONFIG_ZONE_DMA

struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];

EXPORT_SYMBOL(kmalloc_dma_caches);

#endif



#endif /* !CONFIG_SLOB */