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 branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-block.git]
/
mm
/
dmapool.c
diff --git
a/mm/dmapool.c
b/mm/dmapool.c
index 312a716fa14c2ef0d2780832bc378c05a3d08d16..57312b5d6e12aaf2da3f6acd38a19bbe28959077 100644
(file)
--- a/
mm/dmapool.c
+++ b/
mm/dmapool.c
@@
-326,7
+326,7
@@
void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
size_t offset;
void *retval;
- might_sleep_if(
mem_flags & __GFP_WAIT
);
+ might_sleep_if(
gfpflags_allow_blocking(mem_flags)
);
spin_lock_irqsave(&pool->lock, flags);
list_for_each_entry(page, &pool->page_list, page_list) {