提交 de9f521f 编写于 作者: F FUJITA Tomonori 提交者: Ingo Molnar

x86: move pci-nommu's dma_mask check to common code

The check to see if dev->dma_mask is NULL in pci-nommu is more
appropriate for dma_alloc_coherent().
Signed-off-by: NFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: NJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 3a80b6aa
...@@ -80,9 +80,6 @@ nommu_alloc_coherent(struct device *hwdev, size_t size, ...@@ -80,9 +80,6 @@ nommu_alloc_coherent(struct device *hwdev, size_t size,
int node; int node;
struct page *page; struct page *page;
if (hwdev->dma_mask == NULL)
return NULL;
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
gfp |= __GFP_ZERO; gfp |= __GFP_ZERO;
......
...@@ -254,6 +254,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, ...@@ -254,6 +254,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
gfp |= GFP_DMA; gfp |= GFP_DMA;
} }
if (!dev->dma_mask)
return NULL;
if (ops->alloc_coherent) if (ops->alloc_coherent)
return ops->alloc_coherent(dev, size, return ops->alloc_coherent(dev, size,
dma_handle, gfp); dma_handle, gfp);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册