Commit 90c453ca authored Feb 22, 2015 by Linus Torvalds

linux-arm

Pull ARM fix from Russell King:
 "Just one fix this time around.  __iommu_alloc_buffer() can cause a
  BUG() if dma_alloc_coherent() is called with either __GFP_DMA32 or
  __GFP_HIGHMEM set.  The patch from Alexandre addresses this"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer()

parents a135c717 23be7fda

arch/arm/mm/dma-mapping.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1106,7 +1106,7 @@ static struct page *__iommu_alloc_buffer(struct device dev, size_t size,
		int i = 0;

		if (array_size <= PAGE_SIZE)
		pages = kzalloc(array_size, gfp);
		pages = kzalloc(array_size, GFP_KERNEL);
		else
		pages = vzalloc(array_size);
		if (!pages)