Commit 755948cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] api: Flush the current page right than the next
  [CRYPTO] api: Use the right value when advancing scatterwalk_copychunks
parents beff804d 9f116727

crypto/scatterwalk.c

+6 −2
Original line number Diff line number Diff line
@@ -59,8 +59,12 @@ EXPORT_SYMBOL_GPL(scatterwalk_map); 
static void scatterwalk_pagedone(struct scatter_walk *walk, int out,

				 unsigned int more)

{

	if (out)

		flush_dcache_page(scatterwalk_page(walk));

	if (out) {

		struct page *page;



		page = walk->sg->page + ((walk->offset - 1) >> PAGE_SHIFT);

		flush_dcache_page(page);

	}



	if (more) {

		walk->offset += PAGE_SIZE - 1;