From 6f6348b6a40ddf2ce8e4a6c25b28e1c00ea1c74c Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 21 Jan 2008 16:42:45 +1100 Subject: [PATCH] --- yaml --- r: 81347 b: refs/heads/master c: f5d67bd5ecd90cc03eb84f709ab83ccc05a37eee h: refs/heads/master i: 81345: 76f53b05239f11407d56ea63c7fccb67e3bd5ee6 81343: 743050531e67980a3ff3e4f64fb318f3b1dcdd06 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/iommu.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 379a6df443ff..a116116c4504 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35e4a6e26d0c6bc7f32087db61f0fb3666531183 +refs/heads/master: f5d67bd5ecd90cc03eb84f709ab83ccc05a37eee diff --git a/trunk/arch/powerpc/platforms/cell/iommu.c b/trunk/arch/powerpc/platforms/cell/iommu.c index 9682b63dfc78..7f45d59cdf2a 100644 --- a/trunk/arch/powerpc/platforms/cell/iommu.c +++ b/trunk/arch/powerpc/platforms/cell/iommu.c @@ -490,6 +490,8 @@ static struct cbe_iommu *cell_iommu_for_node(int nid) return NULL; } +static unsigned long cell_dma_direct_offset; + static void cell_dma_dev_setup(struct device *dev) { struct iommu_window *window; @@ -497,7 +499,7 @@ static void cell_dma_dev_setup(struct device *dev) struct dev_archdata *archdata = &dev->archdata; if (get_pci_dma_ops() == &dma_direct_ops) { - archdata->dma_data = (void *)dma_direct_offset; + archdata->dma_data = (void *)cell_dma_direct_offset; return; } @@ -655,7 +657,7 @@ static int __init cell_iommu_init_disabled(void) /* If we have no Axon, we set up the spider DMA magic offset */ if (of_find_node_by_name(NULL, "axon") == NULL) - dma_direct_offset = SPIDER_DMA_OFFSET; + cell_dma_direct_offset = SPIDER_DMA_OFFSET; /* Now we need to check to see where the memory is mapped * in PCI space. We assume that all busses use the same dma @@ -689,13 +691,13 @@ static int __init cell_iommu_init_disabled(void) return -ENODEV; } - dma_direct_offset += base; + cell_dma_direct_offset += base; - if (dma_direct_offset != 0) + if (cell_dma_direct_offset != 0) ppc_md.pci_dma_dev_setup = cell_pci_dma_dev_setup; printk("iommu: disabled, direct DMA offset is 0x%lx\n", - dma_direct_offset); + cell_dma_direct_offset); return 0; }