summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-20 11:58:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-20 11:58:56 -0800
commitd49649615d3673ec94139fbd0918fb13949a1d8b (patch)
treeced3194db6057c5bafee503465f2fb63d96e293a /arch/arm
parentb080e047a61f7050246ff3081f87832997170d29 (diff)
parentc091c71ad2218fc50a07b3d1dab85783f3b77efd (diff)
downloadop-kernel-dev-d49649615d3673ec94139fbd0918fb13949a1d8b.zip
op-kernel-dev-d49649615d3673ec94139fbd0918fb13949a1d8b.tar.gz
Merge branch 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping fixes from Marek Szyprowski: "This contains fixes for incorrect atomic test in dma-mapping subsystem for ARM and x86 architecture" * 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: x86: dma-mapping: fix GFP_ATOMIC macro usage ARM: dma-mapping: fix GFP_ATOMIC macro usage
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mm/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 1a77450..11b3914 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1358,7 +1358,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);
/*
OpenPOWER on IntegriCloud