git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vserver 1.9.3
[linux-2.6.git]
/
mm
/
mempool.c
diff --git
a/mm/mempool.c
b/mm/mempool.c
index
a6c1537
..
8dec877
100644
(file)
--- a/
mm/mempool.c
+++ b/
mm/mempool.c
@@
-194,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))