lkml.org 
[lkml]   [2007]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subjectpowerpc: Fix fallout from sg_page() changes
    Fix fallout from 18dabf473e15850c0dbc8ff13ac1e2806d542c15:

    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: Olof Johansson <olof@lixom.net>

    diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
    index 65be95d..ff52013 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 = page_to_bus(sg_page(sg)) + sg->offset;
    }

    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)
    diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c
    index 03f19b8..17b4a7c 100644
    --- a/drivers/scsi/ps3rom.c
    +++ b/drivers/scsi/ps3rom.c
    @@ -147,7 +147,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd *cmd, void *buf)

    req_len = fin = 0;
    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;
    if ((req_len + len) > buflen) {
    len = buflen - req_len;
    -
    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 06:05    [W:4.185 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site