Commit 10c8562f authored Jan 16, 2014 by Marek Szyprowski

ARM: dma-mapping: fix GFP_ATOMIC macro usage



GFP_ATOMIC is not a single gfp flag, but a macro which expands to the other
flags and LACK of __GFP_WAIT flag. To check if caller wanted to perform an
atomic allocation, the code must test __GFP_WAIT flag presence. This patch
fixes the issue introduced in v3.6-rc5

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: stable@vger.kernel.org

parent b28a960c

arch/arm/mm/dma-mapping.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

		/*