Skip to content

Commit

Permalink
[POWERPC] Have celleb use its own dma_direct_offset variable
Browse files Browse the repository at this point in the history
Rather than using the global variable, have celleb use its own
variable to store the direct DMA offset.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Jan 25, 2008
1 parent f5d67bd commit 15c60cc
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/powerpc/platforms/celleb/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 15c60cc

Please sign in to comment.