lib: remove the second argument of k[un]map_atomic()
Cong Wang [Fri, 25 Nov 2011 15:14:39 +0000 (23:14 +0800)]
Signed-off-by: Cong Wang <amwang@redhat.com>

lib/scatterlist.c
lib/swiotlb.c

index 4ceb05d..33b2cbb 100644 (file)
@@ -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);
 
index 058935e..d0f6315 100644 (file)
@@ -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;