diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-08 20:06:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-08 20:06:56 -0700 |
| commit | 941742f49762ba4c908510f036b09a46c1b14513 (patch) | |
| tree | aafb7a72c2072f98889406668003234bed56df02 /drivers/iommu/amd_iommu.c | |
| parent | ac7ba51c215db5739eb640f2f26025ced8668285 (diff) | |
| parent | 5879ae5fd052a63d5ac0684320cb7df3e83da7de (diff) | |
| download | lwn-941742f49762ba4c908510f036b09a46c1b14513.tar.gz lwn-941742f49762ba4c908510f036b09a46c1b14513.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index e43d48956dea..e1c7e9e51045 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -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) { |