diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/dma_64.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/iommu.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c index 3a317cb0636a..739744508c6e 100644 --- a/arch/powerpc/kernel/dma_64.c +++ b/arch/powerpc/kernel/dma_64.c | |||
@@ -68,7 +68,7 @@ static void dma_iommu_unmap_single(struct device *dev, dma_addr_t dma_handle, | |||
68 | static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist, | 68 | static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist, |
69 | int nelems, enum dma_data_direction direction) | 69 | int nelems, enum dma_data_direction direction) |
70 | { | 70 | { |
71 | return iommu_map_sg(dev, sglist, nelems, | 71 | return iommu_map_sg(dev, dev->archdata.dma_data, sglist, nelems, |
72 | device_to_mask(dev), direction); | 72 | device_to_mask(dev), direction); |
73 | } | 73 | } |
74 | 74 | ||
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index 0c663669bc32..ccf00fe9cee6 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c | |||
@@ -267,11 +267,10 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, | |||
267 | spin_unlock_irqrestore(&(tbl->it_lock), flags); | 267 | spin_unlock_irqrestore(&(tbl->it_lock), flags); |
268 | } | 268 | } |
269 | 269 | ||
270 | int iommu_map_sg(struct device *dev, struct scatterlist *sglist, | 270 | int iommu_map_sg(struct device *dev, struct iommu_table *tbl, |
271 | int nelems, unsigned long mask, | 271 | struct scatterlist *sglist, int nelems, |
272 | enum dma_data_direction direction) | 272 | unsigned long mask, enum dma_data_direction direction) |
273 | { | 273 | { |
274 | struct iommu_table *tbl = dev->archdata.dma_data; | ||
275 | dma_addr_t dma_next = 0, dma_addr; | 274 | dma_addr_t dma_next = 0, dma_addr; |
276 | unsigned long flags; | 275 | unsigned long flags; |
277 | struct scatterlist *s, *outs, *segstart; | 276 | struct scatterlist *s, *outs, *segstart; |