Commit b922f53b authored by Jens Axboe's avatar Jens Axboe
Browse files

x86-64: update nommu to sg helpers 



Acked-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 8b87d9f4

arch/x86/kernel/pci-nommu_64.c

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/pci.h>

#include <linux/string.h>

#include <linux/dma-mapping.h>

#include <linux/scatterlist.h>



#include <asm/iommu.h>

#include <asm/processor.h>
@@ -57,10 +58,10 @@ static void nommu_unmap_single(struct device *dev, dma_addr_t addr,size_t size, 
static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,

	       int nents, int direction)

{

	struct scatterlist *s;

	int i;



 	for (i = 0; i < nents; i++ ) {

		struct scatterlist *s = &sg[i];

	for_each_sg(sg, s, nents, i) {

		BUG_ON(!s->page);

		s->dma_address = virt_to_bus(page_address(s->page) +s->offset);

		if (!check_addr("map_sg", hwdev, s->dma_address, s->length))