瀏覽代碼

lib: remove the second argument of k[un]map_atomic()

Signed-off-by: Cong Wang <amwang@redhat.com>
Cong Wang 13 年之前
父節點
當前提交
c3eede8e0a
共有 2 個文件被更改,包括 4 次插入5 次删除
  1. 2 2
      lib/scatterlist.c
  2. 2 3
      lib/swiotlb.c

+ 2 - 2
lib/scatterlist.c

@@ -390,7 +390,7 @@ bool sg_miter_next(struct sg_mapping_iter *miter)
 	miter->consumed = miter->length;
 	miter->consumed = miter->length;
 
 
 	if (miter->__flags & SG_MITER_ATOMIC)
 	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
 	else
 		miter->addr = kmap(miter->page) + off;
 		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) {
 		if (miter->__flags & SG_MITER_ATOMIC) {
 			WARN_ON(!irqs_disabled());
 			WARN_ON(!irqs_disabled());
-			kunmap_atomic(miter->addr, KM_BIO_SRC_IRQ);
+			kunmap_atomic(miter->addr);
 		} else
 		} else
 			kunmap(miter->page);
 			kunmap(miter->page);
 
 

+ 2 - 3
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);
 			sz = min_t(size_t, PAGE_SIZE - offset, size);
 
 
 			local_irq_save(flags);
 			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)
 			if (dir == DMA_TO_DEVICE)
 				memcpy(dma_addr, buffer + offset, sz);
 				memcpy(dma_addr, buffer + offset, sz);
 			else
 			else
 				memcpy(buffer + offset, dma_addr, sz);
 				memcpy(buffer + offset, dma_addr, sz);
-			kunmap_atomic(buffer, KM_BOUNCE_READ);
+			kunmap_atomic(buffer);
 			local_irq_restore(flags);
 			local_irq_restore(flags);
 
 
 			size -= sz;
 			size -= sz;