LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] [POWERPC] Fix fallout from sg_page changes
@ 2007-10-23 14:53 Dale Farnsworth
  2007-10-23 18:44 ` Jens Axboe
  0 siblings, 1 reply; 3+ messages in thread
From: Dale Farnsworth @ 2007-10-23 14:53 UTC (permalink / raw)
  To: Jens Axboe; +Cc: linuxppc-dev, linux-kernel


Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
---
 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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] [POWERPC] Fix fallout from sg_page changes
  2007-10-23 14:53 [PATCH] [POWERPC] Fix fallout from sg_page changes Dale Farnsworth
@ 2007-10-23 18:44 ` Jens Axboe
  2007-10-23 19:15   ` Dale Farnsworth
  0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2007-10-23 18:44 UTC (permalink / raw)
  To: Dale Farnsworth; +Cc: linuxppc-dev, linux-kernel

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

Should already be merged in Linus' current tree.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] [POWERPC] Fix fallout from sg_page changes
  2007-10-23 18:44 ` Jens Axboe
@ 2007-10-23 19:15   ` Dale Farnsworth
  0 siblings, 0 replies; 3+ messages in thread
From: Dale Farnsworth @ 2007-10-23 19:15 UTC (permalink / raw)
  To: Jens Axboe; +Cc: Dale Farnsworth, linuxppc-dev, linux-kernel

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 <dale@farnsworth.org>
> > ---
> >  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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2007-10-23 19:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-23 14:53 [PATCH] [POWERPC] Fix fallout from sg_page changes Dale Farnsworth
2007-10-23 18:44 ` Jens Axboe
2007-10-23 19:15   ` Dale Farnsworth

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).