diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:39 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:27 -0400 |
commit | c3eede8e0a1292d95c051cf947738687b9c42322 (patch) | |
tree | 2c49ee2ddfa1115b45c72cc995f7b6503ea55b64 /lib | |
parent | 0de9a1e28a0d005f42c8cc5456a246710133b9ab (diff) |
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.c | 4 | ||||
-rw-r--r-- | lib/swiotlb.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 4ceb05d772ae..33b2cbb97380 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c | |||
@@ -390,7 +390,7 @@ bool sg_miter_next(struct sg_mapping_iter *miter) | |||
390 | miter->consumed = miter->length; | 390 | miter->consumed = miter->length; |
391 | 391 | ||
392 | if (miter->__flags & SG_MITER_ATOMIC) | 392 | if (miter->__flags & SG_MITER_ATOMIC) |
393 | miter->addr = kmap_atomic(miter->page, KM_BIO_SRC_IRQ) + off; | 393 | miter->addr = kmap_atomic(miter->page) + off; |
394 | else | 394 | else |
395 | miter->addr = kmap(miter->page) + off; | 395 | miter->addr = kmap(miter->page) + off; |
396 | 396 | ||
@@ -424,7 +424,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter) | |||
424 | 424 | ||
425 | if (miter->__flags & SG_MITER_ATOMIC) { | 425 | if (miter->__flags & SG_MITER_ATOMIC) { |
426 | WARN_ON(!irqs_disabled()); | 426 | WARN_ON(!irqs_disabled()); |
427 | kunmap_atomic(miter->addr, KM_BIO_SRC_IRQ); | 427 | kunmap_atomic(miter->addr); |
428 | } else | 428 | } else |
429 | kunmap(miter->page); | 429 | kunmap(miter->page); |
430 | 430 | ||
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 058935ef3975..d0f6315f4a24 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, | |||
349 | sz = min_t(size_t, PAGE_SIZE - offset, size); | 349 | sz = min_t(size_t, PAGE_SIZE - offset, size); |
350 | 350 | ||
351 | local_irq_save(flags); | 351 | local_irq_save(flags); |
352 | buffer = kmap_atomic(pfn_to_page(pfn), | 352 | buffer = kmap_atomic(pfn_to_page(pfn)); |
353 | KM_BOUNCE_READ); | ||
354 | if (dir == DMA_TO_DEVICE) | 353 | if (dir == DMA_TO_DEVICE) |
355 | memcpy(dma_addr, buffer + offset, sz); | 354 | memcpy(dma_addr, buffer + offset, sz); |
356 | else | 355 | else |
357 | memcpy(buffer + offset, dma_addr, sz); | 356 | memcpy(buffer + offset, dma_addr, sz); |
358 | kunmap_atomic(buffer, KM_BOUNCE_READ); | 357 | kunmap_atomic(buffer); |
359 | local_irq_restore(flags); | 358 | local_irq_restore(flags); |
360 | 359 | ||
361 | size -= sz; | 360 | size -= sz; |