Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4964961 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b080e047 c091c71a

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);



	/*

arch/x86/kernel/pci-dma.c

+3 −1
Original line number Diff line number Diff line
@@ -100,8 +100,10 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, 
	flag |= __GFP_ZERO;

again:

	page = NULL;

	if (!(flag & GFP_ATOMIC))

	/* CMA can be used only in the context which permits sleeping */

	if (flag & __GFP_WAIT)

		page = dma_alloc_from_contiguous(dev, count, get_order(size));

	/* fallback */

	if (!page)

		page = alloc_pages_node(dev_to_node(dev), flag, get_order(size));

	if (!page)