From: Steve Wise Date: Mon, 2 Oct 2006 09:17:00 +0000 (-0700) Subject: [PATCH] LIB: add gen_pool_destroy() X-Git-Tag: v2.6.19-rc1~488 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=322acc96d4bd3debea11cd0160b18bd5d7ff0d73;p=linux-2.6-omap-h63xx.git [PATCH] LIB: add gen_pool_destroy() Modules using the genpool allocator need to be able to destroy the data structure when unloading. Signed-off-by: Steve Wise Cc: Randy Dunlap Cc: Dean Nelson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h index 690c42803d2..9869ef3674a 100644 --- a/include/linux/genalloc.h +++ b/include/linux/genalloc.h @@ -31,5 +31,6 @@ struct gen_pool_chunk { extern struct gen_pool *gen_pool_create(int, int); extern int gen_pool_add(struct gen_pool *, unsigned long, size_t, int); +extern void gen_pool_destroy(struct gen_pool *); extern unsigned long gen_pool_alloc(struct gen_pool *, size_t); extern void gen_pool_free(struct gen_pool *, unsigned long, size_t); diff --git a/lib/genalloc.c b/lib/genalloc.c index 71338b48e88..7d16ecabba9 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -70,6 +70,36 @@ int gen_pool_add(struct gen_pool *pool, unsigned long addr, size_t size, EXPORT_SYMBOL(gen_pool_add); +/* + * Destroy a memory pool. Verifies that there are no outstanding allocations. + * + * @pool: pool to destroy + */ +void gen_pool_destroy(struct gen_pool *pool) +{ + struct list_head *_chunk, *_next_chunk; + struct gen_pool_chunk *chunk; + int order = pool->min_alloc_order; + int bit, end_bit; + + + write_lock(&pool->lock); + list_for_each_safe(_chunk, _next_chunk, &pool->chunks) { + chunk = list_entry(_chunk, struct gen_pool_chunk, next_chunk); + list_del(&chunk->next_chunk); + + end_bit = (chunk->end_addr - chunk->start_addr) >> order; + bit = find_next_bit(chunk->bits, end_bit, 0); + BUG_ON(bit < end_bit); + + kfree(chunk); + } + kfree(pool); + return; +} +EXPORT_SYMBOL(gen_pool_destroy); + + /* * Allocate the requested number of bytes from the specified pool. * Uses a first-fit algorithm.