git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' into topic/misc
[pandora-kernel.git]
/
mm
/
dmapool.c
diff --git
a/mm/dmapool.c
b/mm/dmapool.c
index
3df0637
..
4df2de7
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) {