diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
| commit | ca1841de3a426de8cfac6ca61f0f54e6283d0653 (patch) | |
| tree | fc9ca7db1f9ada5301b3684ae75cfe8470071425 /arch/sparc/kernel/iommu.c | |
| parent | c5325bf1df96152c969b44cae2b8131be5621c47 (diff) | |
| parent | 8fd62c82872a5a721c9fb0071ca0f7a49c1732e4 (diff) | |
Merge commit 'v2.6.38.4' into linaro-2.6.38
Diffstat (limited to 'arch/sparc/kernel/iommu.c')
| -rw-r--r-- | arch/sparc/kernel/iommu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c index 72509d0e34b..6f01e8c8319 100644 --- a/arch/sparc/kernel/iommu.c +++ b/arch/sparc/kernel/iommu.c @@ -333,13 +333,10 @@ static void dma_4u_free_coherent(struct device *dev, size_t size, void *cpu, dma_addr_t dvma) { struct iommu *iommu; - iopte_t *iopte; unsigned long flags, order, npages; npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT; iommu = dev->archdata.iommu; - iopte = iommu->page_table + - ((dvma - iommu->page_table_map_base) >> IO_PAGE_SHIFT); spin_lock_irqsave(&iommu->lock, flags); |