Commit c091c71a authored Jan 24, 2014 by Marek Szyprowski

x86: dma-mapping: fix GFP_ATOMIC macro usage



GFP_ATOMIC is not a single gfp flag, but a macro which expands to the other
flags, where meaningful is the LACK of __GFP_WAIT flag. To check if caller
wants to perform an atomic allocation, the code must test for a lack of the
__GFP_WAIT flag. This patch fixes the issue introduced in v3.5-rc1.

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

parent 10c8562f

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)