projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[linux-2.6-block.git]
/
mm
/
dmapool.c
diff --git
a/mm/dmapool.c
b/mm/dmapool.c
index 3df063706f53e6d579ec0acabace3503a471ba29..4df2de77e06956cf68551192d4aa14578bd6ca44 100644
(file)
--- a/
mm/dmapool.c
+++ b/
mm/dmapool.c
@@
-311,6
+311,8
@@
void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
size_t offset;
void *retval;
+ might_sleep_if(mem_flags & __GFP_WAIT);
+
spin_lock_irqsave(&pool->lock, flags);
restart:
list_for_each_entry(page, &pool->page_list, page_list) {