Commit f183323d authored by Matthew Dobson's avatar Matthew Dobson Committed by Linus Torvalds
Browse files

[PATCH] mempool: add kzalloc allocator 



Add another allocator to the common mempool code: a kzalloc/kfree allocator

This will be used by the next patch in the series to replace a mempool-backed
kzalloc allocator.  It is also very likely that there will be more users in
the future.

Signed-off-by: default avatarMatthew Dobson <colpatch@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0eaae62a

include/linux/mempool.h

+8 −2
Original line number Diff line number Diff line
@@ -39,16 +39,22 @@ void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data); 
void mempool_free_slab(void *element, void *pool_data);



/*

 * A mempool_alloc_t and mempool_free_t to kmalloc the amount of memory

 * specified by pool_data

 * 2 mempool_alloc_t's and a mempool_free_t to kmalloc/kzalloc and kfree

 * the amount of memory specified by pool_data

 */

void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data);

void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data);

void mempool_kfree(void *element, void *pool_data);

static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size)

{

	return mempool_create(min_nr, mempool_kmalloc, mempool_kfree,

			      (void *) size);

}

static inline mempool_t *mempool_create_kzalloc_pool(int min_nr, size_t size)

{

	return mempool_create(min_nr, mempool_kzalloc, mempool_kfree,

			      (void *) size);

}



/*

 * A mempool_alloc_t and mempool_free_t for a simple page allocator that

mm/mempool.c

+8 −1
Original line number Diff line number Diff line
@@ -296,11 +296,18 @@ EXPORT_SYMBOL(mempool_free_slab); 
 */

void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data)

{

	size_t size = (size_t) pool_data;

	size_t size = (size_t)(long)pool_data;

	return kmalloc(size, gfp_mask);

}

EXPORT_SYMBOL(mempool_kmalloc);



void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data)

{

	size_t size = (size_t) pool_data;

	return kzalloc(size, gfp_mask);

}

EXPORT_SYMBOL(mempool_kzalloc);



void mempool_kfree(void *element, void *pool_data)

{

	kfree(element);

CRA Git | Maintained and supported by SUSTech CRA and CCSE