diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2008-01-21 00:42:46 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-25 06:52:54 -0500 |
commit | 15c60cc472d4cc0e1bcde1081b0f75ef616e4c7e (patch) | |
tree | a21487182effe66c47dc305532d8cc4c9b7fac87 | |
parent | f5d67bd5ecd90cc03eb84f709ab83ccc05a37eee (diff) |
[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 <michael@ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | 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 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, | |||
52 | return 0; | 52 | return 0; |
53 | } | 53 | } |
54 | 54 | ||
55 | static unsigned long celleb_dma_direct_offset; | ||
56 | |||
55 | static void __init celleb_init_direct_mapping(void) | 57 | static void __init celleb_init_direct_mapping(void) |
56 | { | 58 | { |
57 | u64 lpar_addr, io_addr; | 59 | u64 lpar_addr, io_addr; |
@@ -69,13 +71,13 @@ static void __init celleb_init_direct_mapping(void) | |||
69 | ioid, DMA_FLAGS); | 71 | ioid, DMA_FLAGS); |
70 | } | 72 | } |
71 | 73 | ||
72 | dma_direct_offset = dma_base; | 74 | celleb_dma_direct_offset = dma_base; |
73 | } | 75 | } |
74 | 76 | ||
75 | static void celleb_dma_dev_setup(struct device *dev) | 77 | static void celleb_dma_dev_setup(struct device *dev) |
76 | { | 78 | { |
77 | dev->archdata.dma_ops = get_pci_dma_ops(); | 79 | dev->archdata.dma_ops = get_pci_dma_ops(); |
78 | dev->archdata.dma_data = (void *)dma_direct_offset; | 80 | dev->archdata.dma_data = (void *)celleb_dma_direct_offset; |
79 | } | 81 | } |
80 | 82 | ||
81 | static void celleb_pci_dma_dev_setup(struct pci_dev *pdev) | 83 | static void celleb_pci_dma_dev_setup(struct pci_dev *pdev) |