Skip to content

Commit

Permalink
lib: remove the second argument of k[un]map_atomic()
Browse files Browse the repository at this point in the history
Signed-off-by: Cong Wang <amwang@redhat.com>
  • Loading branch information
Cong Wang authored and Cong Wang committed Mar 20, 2012
1 parent 0de9a1e commit c3eede8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions lib/scatterlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

Expand Down
5 changes: 2 additions & 3 deletions lib/swiotlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c3eede8

Please sign in to comment.