scatterlist fallout: frv
authorAl Viro <viro@ftp.linux.org.uk>
Sat, 27 Oct 2007 18:23:30 +0000 (19:23 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 28 Oct 2007 05:18:11 +0000 (22:18 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/frv/mb93090-mb00/pci-dma.c

index 671ce1e8434f2d27c9a956f2957eb6fcdb29d3fd..662f7b12d005fa532b834ec06838cf5ae56bc264 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/pci.h>
 #include <linux/highmem.h>
+#include <linux/scatterlist.h>
 #include <asm/io.h>
 
 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,
        dampr2 = __get_DAMPR(2);
 
        for (i = 0; i < nents; i++) {
-               vaddr = kmap_atomic(sg[i].page, __KM_CACHE);
+               vaddr = kmap_atomic(sg_page(&sg[i]), __KM_CACHE);
 
                frv_dcache_writeback((unsigned long) vaddr,
                                     (unsigned long) vaddr + PAGE_SIZE);