projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'e26a9e0' into stable/for-linus-3.15
[cascardo/linux.git]
/
arch
/
arm
/
mm
/
dma-mapping.c
diff --git
a/arch/arm/mm/dma-mapping.c
b/arch/arm/mm/dma-mapping.c
index
5bb4e00
..
c9c6acd
100644
(file)
--- a/
arch/arm/mm/dma-mapping.c
+++ b/
arch/arm/mm/dma-mapping.c
@@
-1355,7
+1355,7
@@
static void *arm_iommu_alloc_attrs(struct device *dev, size_t size,
*handle = DMA_ERROR_CODE;
size = PAGE_ALIGN(size);
- if (
gfp & GFP_ATOMIC
)
+ if (
!(gfp & __GFP_WAIT)
)
return __iommu_alloc_atomic(dev, size, handle);
/*