[Cbe-oss-dev] [PATCH 5/7] Have celleb use its own dma_direct_offset variable

[Benjamin Herrenschmidt]

On Mon, 2008-01-21 at 16:42 +1100, Michael Ellerman wrote:
> Rather than using the global variable, have celleb use its own variable to
> store the direct DMA offset.
> 
> Signed-off-by: Michael Ellerman <michael at ellerman.id.au>

Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

> ---
>  arch/powerpc/platforms/celleb/iommu.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c
> index 843a66f..93b0efd 100644
> --- a/arch/powerpc/platforms/celleb/iommu.c
> +++ b/arch/powerpc/platforms/celleb/iommu.c
> @@ -52,6 +52,8 @@ static int __init find_dma_window(u64 *io_space_id, u64 *ioid,
>  	return 0;
>  }
>  
> +static unsigned long celleb_dma_direct_offset;
> +
>  static void __init celleb_init_direct_mapping(void)
>  {
>  	u64 lpar_addr, io_addr;
> @@ -69,13 +71,13 @@ static void __init celleb_init_direct_mapping(void)
>  				     ioid, DMA_FLAGS);
>  	}
>  
> -	dma_direct_offset = dma_base;
> +	celleb_dma_direct_offset = dma_base;
>  }
>  
>  static void celleb_dma_dev_setup(struct device *dev)
>  {
>  	dev->archdata.dma_ops = get_pci_dma_ops();
> -	dev->archdata.dma_data = (void *)dma_direct_offset;
> +	dev->archdata.dma_data = (void *)celleb_dma_direct_offset;
>  }
>  
>  static void celleb_pci_dma_dev_setup(struct pci_dev *pdev)