X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=crypto%2Fscatterwalk.c;h=81afd1790a1d1c28fc8a7e2569940401a668d5ac;hb=c3c117f06e95ea993ba4ed3b246fd76f87a4683f;hp=35172d3f043b47f02ef5c8e20a0ffaf7976bac5b;hpb=3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e;p=powerpc.git

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 35172d3f04..81afd1790a 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -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;
@@ -91,6 +95,8 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 		memcpy_dir(buf, vaddr, len_this_page, out);
 		scatterwalk_unmap(vaddr, out);
 
+		scatterwalk_advance(walk, len_this_page);
+
 		if (nbytes == len_this_page)
 			break;
 
@@ -99,7 +105,5 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 
 		scatterwalk_pagedone(walk, out, 1);
 	}
-
-	scatterwalk_advance(walk, nbytes);
 }
 EXPORT_SYMBOL_GPL(scatterwalk_copychunks);