summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2011-11-25 23:14:39 +0800
committerCong Wang <xiyou.wangcong@gmail.com>2012-03-20 21:48:27 +0800
commitc3eede8e0a1292d95c051cf947738687b9c42322 (patch)
tree2c49ee2ddfa1115b45c72cc995f7b6503ea55b64 /lib
parent0de9a1e28a0d005f42c8cc5456a246710133b9ab (diff)
downloadlinux-3.10-c3eede8e0a1292d95c051cf947738687b9c42322.tar.gz
linux-3.10-c3eede8e0a1292d95c051cf947738687b9c42322.tar.bz2
linux-3.10-c3eede8e0a1292d95c051cf947738687b9c42322.zip
lib: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/scatterlist.c4
-rw-r--r--lib/swiotlb.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 4ceb05d772a..33b2cbb9738 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 058935ef397..d0f6315f4a2 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;