Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3eede8e authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

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



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 0de9a1e2

lib/scatterlist.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

lib/swiotlb.c

+2 −3
Original line number Diff line number Diff line
@@ -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;