From: Michael Ellerman Date: Mon, 21 Jan 2008 05:42:46 +0000 (+1100) Subject: [POWERPC] Have celleb use its own dma_direct_offset variable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=15c60cc472d4cc0e1bcde1081b0f75ef616e4c7e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [POWERPC] Have celleb use its own dma_direct_offset variable Rather than using the global variable, have celleb use its own variable to store the direct DMA offset. Signed-off-by: Michael Ellerman Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c index 843a66f422bb..93b0efddd658 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)