lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm: sg fallout

Browse Source 
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2007-10-23 12:37:59 +02:00
parent 4fcc47a053
commit dee9ba828f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/asm-arm/dma-mapping.h
View File

@@ -5,7 +5,7 @@
#include <linux/mm.h> /* need struct page */ #include <linux/mm.h> /* need struct page */
#include <asm/scatterlist.h> #include <linux/scatterlist.h>
/* /*
* DMA-consistent mapping functions. These allocate/free a region of * DMA-consistent mapping functions. These allocate/free a region of
@@ -274,8 +274,8 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
for (i = 0; i < nents; i++, sg++) { for (i = 0; i < nents; i++, sg++) {
char *virt; char *virt;
sg->dma_address = page_to_dma(dev, sg->page) + sg->offset; sg->dma_address = page_to_dma(dev, sg_page(sg)) + sg->offset;
virt = page_address(sg->page) + sg->offset; virt = sg_virt(sg);
if (!arch_is_coherent()) if (!arch_is_coherent())
dma_cache_maint(virt, sg->length, dir); dma_cache_maint(virt, sg->length, dir);
@@ -371,7 +371,7 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,
int i; int i;
for (i = 0; i < nents; i++, sg++) { for (i = 0; i < nents; i++, sg++) {
char *virt = page_address(sg->page) + sg->offset; char *virt = sg_virt(sg);
if (!arch_is_coherent()) if (!arch_is_coherent())
dma_cache_maint(virt, sg->length, dir); dma_cache_maint(virt, sg->length, dir);
} }
@@ -384,7 +384,7 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,
int i; int i;
for (i = 0; i < nents; i++, sg++) { for (i = 0; i < nents; i++, sg++) {
char *virt = page_address(sg->page) + sg->offset; char *virt = sg_virt(sg);
if (!arch_is_coherent()) if (!arch_is_coherent())
dma_cache_maint(virt, sg->length, dir); dma_cache_maint(virt, sg->length, dir);
} }