aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/iommu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/mm/iommu.c')
-rw-r--r--arch/sparc/mm/iommu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 832d99f33470..2970cea877b1 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -334,11 +334,11 @@ static void iommu_release_scsi_sgl(struct device *dev, struct scatterlist *sg, i
334} 334}
335 335
336#ifdef CONFIG_SBUS 336#ifdef CONFIG_SBUS
337static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va, 337static int iommu_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned long va,
338 unsigned long addr, int len) 338 unsigned long addr, int len)
339{ 339{
340 struct iommu_struct *iommu = dev->archdata.iommu;
340 unsigned long page, end; 341 unsigned long page, end;
341 struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu;
342 iopte_t *iopte = iommu->page_table; 342 iopte_t *iopte = iommu->page_table;
343 iopte_t *first; 343 iopte_t *first;
344 int ioptex; 344 int ioptex;
@@ -401,9 +401,9 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,
401 return 0; 401 return 0;
402} 402}
403 403
404static void iommu_unmap_dma_area(unsigned long busa, int len) 404static void iommu_unmap_dma_area(struct device *dev, unsigned long busa, int len)
405{ 405{
406 struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu; 406 struct iommu_struct *iommu = dev->archdata.iommu;
407 iopte_t *iopte = iommu->page_table; 407 iopte_t *iopte = iommu->page_table;
408 unsigned long end; 408 unsigned long end;
409 int ioptex = (busa - iommu->start) >> PAGE_SHIFT; 409 int ioptex = (busa - iommu->start) >> PAGE_SHIFT;