lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 49/60] lib: remove the second argument of k[un]map_atomic()
    Date
    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    lib/scatterlist.c | 4 ++--
    lib/swiotlb.c | 5 ++---
    2 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/lib/scatterlist.c b/lib/scatterlist.c
    index 4ceb05d..33b2cbb 100644
    --- a/lib/scatterlist.c
    +++ b/lib/scatterlist.c
    @@ -390,7 +390,7 @@ bool sg_miter_next(struct sg_mapping_iter *miter)
    miter->consumed = miter->length;

    if (miter->__flags & SG_MITER_ATOMIC)
    - miter->addr = kmap_atomic(miter->page, KM_BIO_SRC_IRQ) + off;
    + miter->addr = kmap_atomic(miter->page) + off;
    else
    miter->addr = kmap(miter->page) + off;

    @@ -424,7 +424,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)

    if (miter->__flags & SG_MITER_ATOMIC) {
    WARN_ON(!irqs_disabled());
    - kunmap_atomic(miter->addr, KM_BIO_SRC_IRQ);
    + kunmap_atomic(miter->addr);
    } else
    kunmap(miter->page);

    diff --git a/lib/swiotlb.c b/lib/swiotlb.c
    index 058935e..d0f6315 100644
    --- a/lib/swiotlb.c
    +++ b/lib/swiotlb.c
    @@ -349,13 +349,12 @@ void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
    sz = min_t(size_t, PAGE_SIZE - offset, size);

    local_irq_save(flags);
    - buffer = kmap_atomic(pfn_to_page(pfn),
    - KM_BOUNCE_READ);
    + buffer = kmap_atomic(pfn_to_page(pfn));
    if (dir == DMA_TO_DEVICE)
    memcpy(dma_addr, buffer + offset, sz);
    else
    memcpy(buffer + offset, dma_addr, sz);
    - kunmap_atomic(buffer, KM_BOUNCE_READ);
    + kunmap_atomic(buffer);
    local_irq_restore(flags);

    size -= sz;
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-02-10 06:49    [W:0.024 / U:122.980 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site