Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=15c60cc472d4cc0e1bcde1081b0f75ef616e4c7e Commit: 15c60cc472d4cc0e1bcde1081b0f75ef616e4c7e Parent: f5d67bd5ecd90cc03eb84f709ab83ccc05a37eee Author: Michael Ellerman <[EMAIL PROTECTED]> AuthorDate: Mon Jan 21 16:42:46 2008 +1100 Committer: Paul Mackerras <[EMAIL PROTECTED]> CommitDate: Fri Jan 25 22:52:54 2008 +1100
[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 <[EMAIL PROTECTED]> Acked-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]> Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]> --- 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) - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html