diff options
Diffstat (limited to 'mm/mempool.c')
-rw-r--r-- | mm/mempool.c | 50 |
1 files changed, 46 insertions, 4 deletions
diff --git a/mm/mempool.c b/mm/mempool.c index 1a99b80480d3..fe6e05289cc5 100644 --- a/mm/mempool.c +++ b/mm/mempool.c | |||
@@ -183,8 +183,8 @@ EXPORT_SYMBOL(mempool_resize); | |||
183 | */ | 183 | */ |
184 | void mempool_destroy(mempool_t *pool) | 184 | void mempool_destroy(mempool_t *pool) |
185 | { | 185 | { |
186 | if (pool->curr_nr != pool->min_nr) | 186 | /* Check for outstanding elements */ |
187 | BUG(); /* There were outstanding elements */ | 187 | BUG_ON(pool->curr_nr != pool->min_nr); |
188 | free_pool(pool); | 188 | free_pool(pool); |
189 | } | 189 | } |
190 | EXPORT_SYMBOL(mempool_destroy); | 190 | EXPORT_SYMBOL(mempool_destroy); |
@@ -278,14 +278,56 @@ EXPORT_SYMBOL(mempool_free); | |||
278 | */ | 278 | */ |
279 | void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data) | 279 | void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data) |
280 | { | 280 | { |
281 | kmem_cache_t *mem = (kmem_cache_t *) pool_data; | 281 | struct kmem_cache *mem = pool_data; |
282 | return kmem_cache_alloc(mem, gfp_mask); | 282 | return kmem_cache_alloc(mem, gfp_mask); |
283 | } | 283 | } |
284 | EXPORT_SYMBOL(mempool_alloc_slab); | 284 | EXPORT_SYMBOL(mempool_alloc_slab); |
285 | 285 | ||
286 | void mempool_free_slab(void *element, void *pool_data) | 286 | void mempool_free_slab(void *element, void *pool_data) |
287 | { | 287 | { |
288 | kmem_cache_t *mem = (kmem_cache_t *) pool_data; | 288 | struct kmem_cache *mem = pool_data; |
289 | kmem_cache_free(mem, element); | 289 | kmem_cache_free(mem, element); |
290 | } | 290 | } |
291 | EXPORT_SYMBOL(mempool_free_slab); | 291 | EXPORT_SYMBOL(mempool_free_slab); |
292 | |||
293 | /* | ||
294 | * A commonly used alloc and free fn that kmalloc/kfrees the amount of memory | ||
295 | * specfied by pool_data | ||
296 | */ | ||
297 | void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data) | ||
298 | { | ||
299 | size_t size = (size_t)(long)pool_data; | ||
300 | return kmalloc(size, gfp_mask); | ||
301 | } | ||
302 | EXPORT_SYMBOL(mempool_kmalloc); | ||
303 | |||
304 | void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data) | ||
305 | { | ||
306 | size_t size = (size_t) pool_data; | ||
307 | return kzalloc(size, gfp_mask); | ||
308 | } | ||
309 | EXPORT_SYMBOL(mempool_kzalloc); | ||
310 | |||
311 | void mempool_kfree(void *element, void *pool_data) | ||
312 | { | ||
313 | kfree(element); | ||
314 | } | ||
315 | EXPORT_SYMBOL(mempool_kfree); | ||
316 | |||
317 | /* | ||
318 | * A simple mempool-backed page allocator that allocates pages | ||
319 | * of the order specified by pool_data. | ||
320 | */ | ||
321 | void *mempool_alloc_pages(gfp_t gfp_mask, void *pool_data) | ||
322 | { | ||
323 | int order = (int)(long)pool_data; | ||
324 | return alloc_pages(gfp_mask, order); | ||
325 | } | ||
326 | EXPORT_SYMBOL(mempool_alloc_pages); | ||
327 | |||
328 | void mempool_free_pages(void *element, void *pool_data) | ||
329 | { | ||
330 | int order = (int)(long)pool_data; | ||
331 | __free_pages(element, order); | ||
332 | } | ||
333 | EXPORT_SYMBOL(mempool_free_pages); | ||