Commit 44953afb authored Jun 05, 2015 by Linus Torvalds

iommu

Pull iommu fix from Joerg Roedel:
 "Only one patch:

   - Revert "iommu/amd: Don't allocate with __GFP_ZERO in
     alloc_coherent".

     This patch caused problems with some drivers, so it is better to
     revert it now until the drivers have been fixed"

* tag 'iommu-fixes-v4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  Revert "iommu/amd: Don't allocate with __GFP_ZERO in alloc_coherent"

parents 51d0f0cb 2d0ec7a1

drivers/iommu/amd_iommu.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2930,6 +2930,7 @@ static void alloc_coherent(struct device dev, size_t size,
		size = PAGE_ALIGN(size);
		dma_mask = dev->coherent_dma_mask;
		flag &= ~(__GFP_DMA \| __GFP_HIGHMEM \| __GFP_DMA32);
		flag \|= __GFP_ZERO;

		page = alloc_pages(flag \| __GFP_NOWARN, get_order(size));
		if (!page) {