[PATCH 06/31] alpha/pci-noop: handle page-less SG entries
From: Christoph Hellwig <hch@lst.de>
Date: 2015-08-12 07:20:01
Also in:
linux-alpha, linux-arch, linux-media, linux-mips, linux-s390, lkml, sparclinux
Subsystem:
alpha port, the rest · Maintainers:
Richard Henderson, Matt Turner, Magnus Lindholm, Linus Torvalds
Use sg_phys() instead of virt_to_phys(sg_virt(sg)) so that we don't require a kernel virtual address. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/alpha/kernel/pci-noop.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
index df24b76..7319151 100644
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c@@ -145,11 +145,7 @@ static int alpha_noop_map_sg(struct device *dev, struct scatterlist *sgl, int ne struct scatterlist *sg; for_each_sg(sgl, sg, nents, i) { - void *va; - - BUG_ON(!sg_page(sg)); - va = sg_virt(sg); - sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va); + sg_dma_address(sg) = (dma_addr_t)sg_phys(sg); sg_dma_len(sg) = sg->length; }
--
1.9.1