X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Fmempool.c;h=8dec8779e28f0c60dfff8fc2afce56308b9c50d5;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=da6ad1e12c97b85e516c40b52da542476008894d;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/mm/mempool.c b/mm/mempool.c
index da6ad1e12..8dec8779e 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -89,11 +89,6 @@ mempool_t * mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
 }
 EXPORT_SYMBOL(mempool_create);
 
-/*
- * mempool_resize is disabled for now, because it has no callers.  Feel free
- * to turn it back on if needed.
- */
-#if 0
 /**
  * mempool_resize - resize an existing memory pool
  * @pool:       pointer to the memory pool which was allocated via
@@ -163,7 +158,6 @@ out:
 	return 0;
 }
 EXPORT_SYMBOL(mempool_resize);
-#endif
 
 /**
  * mempool_destroy - deallocate a memory pool
@@ -200,6 +194,7 @@ void * mempool_alloc(mempool_t *pool, int gfp_mask)
 	DEFINE_WAIT(wait);
 	int gfp_nowait = gfp_mask & ~(__GFP_WAIT | __GFP_IO);
 
+	might_sleep_if(gfp_mask & __GFP_WAIT);
 repeat_alloc:
 	element = pool->alloc(gfp_nowait|__GFP_NOWARN, pool->pool_data);
 	if (likely(element != NULL))