Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b61e8f48 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

parisc: fix sg_page() fallout 



arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_map_sg':
arch/parisc/kernel/pci-dma.c:487: error: 'struct scatterlist' has no member named 'page'
arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_unmap_sg':
arch/parisc/kernel/pci-dma.c:508: error: 'struct scatterlist' has no member named 'page'
arch/parisc/kernel/pci-dma.c:508: error: 'struct scatterlist' has no member named 'page'
arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_sync_sg_for_cpu':
arch/parisc/kernel/pci-dma.c:535: error: 'struct scatterlist' has no member named 'page'
arch/parisc/kernel/pci-dma.c:535: error: 'struct scatterlist' has no member named 'page'
arch/parisc/kernel/pci-dma.c: In function 'pa11_dma_sync_sg_for_device':
arch/parisc/kernel/pci-dma.c:545: error: 'struct scatterlist' has no member named 'page'
arch/parisc/kernel/pci-dma.c:545: error: 'struct scatterlist' has no member named 'page'

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent dc81785d

arch/parisc/kernel/pci-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/scatterlist.h>



#include <asm/cacheflush.h>

#include <asm/dma.h>    /* for DMA_CHUNK_SIZE */

drivers/parisc/ccio-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/reboot.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/scatterlist.h>



#include <asm/byteorder.h>

#include <asm/cache.h>		/* for L1_CACHE_BYTES */

drivers/parisc/sba_iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/mm.h>

#include <linux/string.h>

#include <linux/pci.h>

#include <linux/scatterlist.h>



#include <asm/byteorder.h>

#include <asm/io.h>

include/asm-parisc/scatterlist.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ struct scatterlist { 
	__u32      iova_length; /* bytes mapped */

};



#define sg_virt_addr(sg) ((unsigned long)(page_address(sg->page) + sg->offset))

#define sg_virt_addr(sg) ((unsigned long)sg_virt(sg))

#define sg_dma_address(sg) ((sg)->iova)

#define sg_dma_len(sg)     ((sg)->iova_length)