diff options
Diffstat (limited to 'arch/sparc/mm/io-unit.c')
-rw-r--r-- | arch/sparc/mm/io-unit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index daadf5f88050..005e758a4db7 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
@@ -156,8 +156,8 @@ static void iounit_get_scsi_sgl(struct device *dev, struct scatterlist *sg, int | |||
156 | spin_lock_irqsave(&iounit->lock, flags); | 156 | spin_lock_irqsave(&iounit->lock, flags); |
157 | while (sz != 0) { | 157 | while (sz != 0) { |
158 | --sz; | 158 | --sz; |
159 | sg->dvma_address = iounit_get_area(iounit, (unsigned long) sg_virt(sg), sg->length); | 159 | sg->dma_address = iounit_get_area(iounit, (unsigned long) sg_virt(sg), sg->length); |
160 | sg->dvma_length = sg->length; | 160 | sg->dma_length = sg->length; |
161 | sg = sg_next(sg); | 161 | sg = sg_next(sg); |
162 | } | 162 | } |
163 | spin_unlock_irqrestore(&iounit->lock, flags); | 163 | spin_unlock_irqrestore(&iounit->lock, flags); |
@@ -186,8 +186,8 @@ static void iounit_release_scsi_sgl(struct device *dev, struct scatterlist *sg, | |||
186 | spin_lock_irqsave(&iounit->lock, flags); | 186 | spin_lock_irqsave(&iounit->lock, flags); |
187 | while (sz != 0) { | 187 | while (sz != 0) { |
188 | --sz; | 188 | --sz; |
189 | len = ((sg->dvma_address & ~PAGE_MASK) + sg->length + (PAGE_SIZE-1)) >> PAGE_SHIFT; | 189 | len = ((sg->dma_address & ~PAGE_MASK) + sg->length + (PAGE_SIZE-1)) >> PAGE_SHIFT; |
190 | vaddr = (sg->dvma_address - IOUNIT_DMA_BASE) >> PAGE_SHIFT; | 190 | vaddr = (sg->dma_address - IOUNIT_DMA_BASE) >> PAGE_SHIFT; |
191 | IOD(("iounit_release %08lx-%08lx\n", (long)vaddr, (long)len+vaddr)); | 191 | IOD(("iounit_release %08lx-%08lx\n", (long)vaddr, (long)len+vaddr)); |
192 | for (len += vaddr; vaddr < len; vaddr++) | 192 | for (len += vaddr; vaddr < len; vaddr++) |
193 | clear_bit(vaddr, iounit->bmap); | 193 | clear_bit(vaddr, iounit->bmap); |