lkml.org 
[lkml]   [2007]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] Bugfix to commit 18dabf473e15850c0dbc8ff13ac1e2806d542c15
    On 10/23/07, Grant Likely <grant.likely@secretlab.ca> wrote:
    > From: Grant Likely <grant.likely@secretlab.ca>
    >
    > 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 <grant.likely@secretlab.ca>
    > ---
    >
    > 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
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-10-23 17:39    [W:0.049 / U:30.404 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site