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

Commit 5edadbd0 authored by Olof Johansson's avatar Olof Johansson Committed by Jens Axboe
Browse files

powerpc: Fix fallout from sg_page() changes 



Fix fallout from 18dabf47:

In file included from include/linux/dma-mapping.h:52,
                 from drivers/base/dma-mapping.c:10:
include/asm/dma-mapping.h: In function 'dma_map_sg':
include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:289: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:290: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h: In function 'dma_sync_sg_for_cpu':
include/asm/dma-mapping.h:331: error: 'struct scatterlist' has no member named 'page'

drivers/scsi/ps3rom.c: In function 'fetch_to_dev_buffer':
drivers/scsi/ps3rom.c:150: error: 'struct scatterlist' has no member named 'page'

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent c8ac5a73

drivers/scsi/ps3rom.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd *cmd, void *buf) 




	req_len = fin = 0;

	req_len = fin = 0;

	scsi_for_each_sg(cmd, sgpnt, scsi_sg_count(cmd), k) {

	scsi_for_each_sg(cmd, sgpnt, scsi_sg_count(cmd), k) {

		kaddr = kmap_atomic(sg_page(sgpnt->page), KM_IRQ0);

		kaddr = kmap_atomic(sg_page(sgpnt), KM_IRQ0);

		len = sgpnt->length;

		len = sgpnt->length;

		if ((req_len + len) > buflen) {

		if ((req_len + len) > buflen) {

			len = buflen - req_len;

			len = buflen - req_len;

include/asm-powerpc/dma-mapping.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -285,9 +285,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents, 
	BUG_ON(direction == DMA_NONE);

	BUG_ON(direction == DMA_NONE);





	for_each_sg(sgl, sg, nents, i) {

	for_each_sg(sgl, sg, nents, i) {

		BUG_ON(!sg->page);

		BUG_ON(!sg_page(sg));

		__dma_sync_page(sg->page, sg->offset, sg->length, direction);

		__dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);

		sg->dma_address = page_to_bus(sg->page) + sg->offset;

		sg->dma_address = page_to_bus(sg_page(sg)) + sg->offset;

	}

	}





	return nents;

	return nents;
@@ -328,7 +328,7 @@ static inline void dma_sync_sg_for_cpu(struct device *dev, 
	BUG_ON(direction == DMA_NONE);

	BUG_ON(direction == DMA_NONE);





	for_each_sg(sgl, sg, nents, i)

	for_each_sg(sgl, sg, nents, i)

		__dma_sync_page(sg->page, sg->offset, sg->length, direction);

		__dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);

}

}





static inline void dma_sync_sg_for_device(struct device *dev,

static inline void dma_sync_sg_for_device(struct device *dev,
@@ -341,7 +341,7 @@ static inline void dma_sync_sg_for_device(struct device *dev, 
	BUG_ON(direction == DMA_NONE);

	BUG_ON(direction == DMA_NONE);





	for_each_sg(sgl, sg, nents, i)

	for_each_sg(sgl, sg, nents, i)

		__dma_sync_page(sg->page, sg->offset, sg->length, direction);

		__dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);

}

}





static inline int dma_mapping_error(dma_addr_t dma_addr)

static inline int dma_mapping_error(dma_addr_t dma_addr)