On Mon, Sep 08, 2008 at 06:10:11PM +0900, FUJITA Tomonori wrote:
> The check to see if dev->dma_mask is NULL in pci-nommu is more
> appropriate for dma_alloc_coherent().
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Acked-by: Joerg Roedel <joerg.roedel@xxxxxxx>
> ---
> arch/x86/kernel/pci-nommu.c | 3 ---
> include/asm-x86/dma-mapping.h | 3 +++
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
> index 73853d3..0f51883 100644
> --- a/arch/x86/kernel/pci-nommu.c
> +++ b/arch/x86/kernel/pci-nommu.c
> @@ -80,9 +80,6 @@ nommu_alloc_coherent(struct device *hwdev, size_t size,
> int node;
> struct page *page;
>
> - if (hwdev->dma_mask == NULL)
> - return NULL;
> -
> gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
> gfp |= __GFP_ZERO;
>
> diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
> index bc6c8df..39d3641 100644
> --- a/include/asm-x86/dma-mapping.h
> +++ b/include/asm-x86/dma-mapping.h
> @@ -256,6 +256,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
> gfp |= GFP_DMA;
> }
>
> + if (!dev->dma_mask)
> + return NULL;
> +
> if (ops->alloc_coherent)
> return ops->alloc_coherent(dev, size,
> dma_handle, gfp);
> --
> 1.5.5.GIT
>
>
--
| AMD Saxony Limited Liability Company & Co. KG
Operating | Wilschdorfer Landstr. 101, 01109 Dresden, Germany
System | Register Court Dresden: HRA 4896
Research | General Partner authorized to represent:
Center | AMD Saxony LLC (Wilmington, Delaware, US)
| General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy
--
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|