2007-10-23 15:00:30

by Dale Farnsworth

Subject: [PATCH] [POWERPC] Fix fallout from sg_page changes

Signed-off-by: Dale Farnsworth <[email protected]>
---
include/asm-powerpc/dma-mapping.h | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
index 65be95d..43b4f3b 100644
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
@@ -285,9 +285,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
BUG_ON(direction == DMA_NONE);

for_each_sg(sgl, sg, nents, i) {
- BUG_ON(!sg->page);
- __dma_sync_page(sg->page, sg->offset, sg->length, direction);
- sg->dma_address = page_to_bus(sg->page) + sg->offset;
+ BUG_ON(!sg_page(sg));
+ __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
+ sg->dma_address = virt_to_bus(sg_virt(sg));
}

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

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,
@@ -341,7 +341,7 @@ static inline void dma_sync_sg_for_device(struct device *dev,
BUG_ON(direction == DMA_NONE);

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)
--
1.5.3.4

2007-10-23 18:45:05

by Jens Axboe

Subject: Re: [PATCH] [POWERPC] Fix fallout from sg_page changes

On Tue, Oct 23 2007, Dale Farnsworth wrote:
>
> Signed-off-by: Dale Farnsworth <[email protected]>
> ---
> include/asm-powerpc/dma-mapping.h | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)

Should already be merged in Linus' current tree.

--
Jens Axboe

2007-10-23 19:15:56

by Dale Farnsworth

Subject: Re: [PATCH] [POWERPC] Fix fallout from sg_page changes

On Tue, Oct 23, 2007 at 08:44:48PM +0200, Jens Axboe wrote:
> On Tue, Oct 23 2007, Dale Farnsworth wrote:
> >
> > Signed-off-by: Dale Farnsworth <[email protected]>
> > ---
> > include/asm-powerpc/dma-mapping.h | 10 +++++-----
> > 1 files changed, 5 insertions(+), 5 deletions(-)
>
> Should already be merged in Linus' current tree.

Yes, it is. Thank you.

-Dale