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

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

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



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

crypto/ahash.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int hash_walk_next(struct crypto_hash_walk *walk) 
	unsigned int nbytes = min(walk->entrylen,

				  ((unsigned int)(PAGE_SIZE)) - offset);



	walk->data = crypto_kmap(walk->pg, 0);

	walk->data = kmap_atomic(walk->pg);

	walk->data += offset;



	if (offset & alignmask) {
@@ -93,7 +93,7 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) 
		return nbytes;

	}



	crypto_kunmap(walk->data, 0);

	kunmap_atomic(walk->data);

	crypto_yield(walk->flags);



	if (err)

crypto/async_tx/async_memcpy.c

+4 −4
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
		/* wait for any prerequisite operations */

		async_tx_quiesce(&submit->depend_tx);



		dest_buf = kmap_atomic(dest, KM_USER0) + dest_offset;

		src_buf = kmap_atomic(src, KM_USER1) + src_offset;

		dest_buf = kmap_atomic(dest) + dest_offset;

		src_buf = kmap_atomic(src) + src_offset;



		memcpy(dest_buf, src_buf, len);



		kunmap_atomic(src_buf, KM_USER1);

		kunmap_atomic(dest_buf, KM_USER0);

		kunmap_atomic(src_buf);

		kunmap_atomic(dest_buf);



		async_tx_sync_epilog(submit);

	}

crypto/blkcipher.c

+4 −4
Original line number Diff line number Diff line
@@ -43,22 +43,22 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc, 


static inline void blkcipher_map_src(struct blkcipher_walk *walk)

{

	walk->src.virt.addr = scatterwalk_map(&walk->in, 0);

	walk->src.virt.addr = scatterwalk_map(&walk->in);

}



static inline void blkcipher_map_dst(struct blkcipher_walk *walk)

{

	walk->dst.virt.addr = scatterwalk_map(&walk->out, 1);

	walk->dst.virt.addr = scatterwalk_map(&walk->out);

}



static inline void blkcipher_unmap_src(struct blkcipher_walk *walk)

{

	scatterwalk_unmap(walk->src.virt.addr, 0);

	scatterwalk_unmap(walk->src.virt.addr);

}



static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk)

{

	scatterwalk_unmap(walk->dst.virt.addr, 1);

	scatterwalk_unmap(walk->dst.virt.addr);

}



/* Get a spot of the specified length that does not straddle a page.

crypto/ccm.c

+2 −2
Original line number Diff line number Diff line
@@ -216,12 +216,12 @@ static void get_data_to_compute(struct crypto_cipher *tfm, 
			scatterwalk_start(&walk, sg_next(walk.sg));

			n = scatterwalk_clamp(&walk, len);

		}

		data_src = scatterwalk_map(&walk, 0);

		data_src = scatterwalk_map(&walk);



		compute_mac(tfm, data_src, n, pctx);

		len -= n;



		scatterwalk_unmap(data_src, 0);

		scatterwalk_unmap(data_src);

		scatterwalk_advance(&walk, n);

		scatterwalk_done(&walk, 0, len);

		if (len)

crypto/scatterwalk.c

+4 −4
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ void scatterwalk_start(struct scatter_walk *walk, struct scatterlist *sg) 
}

EXPORT_SYMBOL_GPL(scatterwalk_start);



void *scatterwalk_map(struct scatter_walk *walk, int out)

void *scatterwalk_map(struct scatter_walk *walk)

{

	return crypto_kmap(scatterwalk_page(walk), out) +

	return kmap_atomic(scatterwalk_page(walk)) +

	       offset_in_page(walk->offset);

}

EXPORT_SYMBOL_GPL(scatterwalk_map);
@@ -83,9 +83,9 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk, 
		if (len_this_page > nbytes)

			len_this_page = nbytes;



		vaddr = scatterwalk_map(walk, out);

		vaddr = scatterwalk_map(walk);

		memcpy_dir(buf, vaddr, len_this_page, out);

		scatterwalk_unmap(vaddr, out);

		scatterwalk_unmap(vaddr);



		scatterwalk_advance(walk, len_this_page);