diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-27 14:23:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-28 01:18:11 -0400 |
commit | 9e6a76b8bb814d0e53473ebe55d4fa18ba89ce77 (patch) | |
tree | 03932d10862cfcea84d573c2b45e49d7232496e2 /arch/frv/mb93090-mb00 | |
parent | ef49c32b8489a845a54ca4689b17bfbf8db9bf9e (diff) |
scatterlist fallout: frv
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv/mb93090-mb00')
-rw-r--r-- | arch/frv/mb93090-mb00/pci-dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c index 671ce1e8434f..662f7b12d005 100644 --- a/arch/frv/mb93090-mb00/pci-dma.c +++ b/arch/frv/mb93090-mb00/pci-dma.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
16 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
18 | #include <linux/scatterlist.h> | ||
18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
19 | 20 | ||
20 | void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) | 21 | void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) |
@@ -86,7 +87,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
86 | dampr2 = __get_DAMPR(2); | 87 | dampr2 = __get_DAMPR(2); |
87 | 88 | ||
88 | for (i = 0; i < nents; i++) { | 89 | for (i = 0; i < nents; i++) { |
89 | vaddr = kmap_atomic(sg[i].page, __KM_CACHE); | 90 | vaddr = kmap_atomic(sg_page(&sg[i]), __KM_CACHE); |
90 | 91 | ||
91 | frv_dcache_writeback((unsigned long) vaddr, | 92 | frv_dcache_writeback((unsigned long) vaddr, |
92 | (unsigned long) vaddr + PAGE_SIZE); | 93 | (unsigned long) vaddr + PAGE_SIZE); |