From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.239]) by ozlabs.org (Postfix) with ESMTP id 419CBDDFD6 for ; Wed, 24 Oct 2007 01:35:51 +1000 (EST) Received: by nz-out-0506.google.com with SMTP id i1so782006nzh for ; Tue, 23 Oct 2007 08:35:50 -0700 (PDT) Message-ID: Date: Tue, 23 Oct 2007 09:35:49 -0600 From: "Grant Likely" Sender: glikely@secretlab.ca To: linux-kernel@vger.kernel.org, "Jens Axboe" , linuxppc-dev@ozlabs.org, "Linus Torvalds" , paulus@samba.org Subject: Re: [PATCH] Bugfix to commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15 In-Reply-To: <20071023151929.12090.3835.stgit@trillian.cg.shawcable.net> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 References: <20071023151929.12090.3835.stgit@trillian.cg.shawcable.net> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 10/23/07, Grant Likely wrote: > From: Grant Likely > > Fixup for commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15. Changes to > dma_map_sg where done in asm-x86/dma-mapping_32.h, but were not mirrored > in include/asm-powerpc/dma-mapping.h > > Signed-off-by: Grant Likely > --- > > Linus, I cannot build an arch/powerpc kernel without this patch. Oops, ignore this patch. It's doesn't change all the references, it uses the wrong method for calculating dma_address and 2 other people have already sent the fix for this. /me puts on a paper bag g. > > Cheers, > g. > > include/asm-powerpc/dma-mapping.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h > index 65be95d..fd33ce4 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); > + BUG_ON(!sg_page(sg)); > __dma_sync_page(sg->page, sg->offset, sg->length, direction); > - sg->dma_address = page_to_bus(sg->page) + sg->offset; > + sg->dma_address = sg_phys(sg); > } > > return nents; > > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. grant.likely@secretlab.ca (403) 399-0195