X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=crypto%2Fscatterwalk.c;h=81afd1790a1d1c28fc8a7e2569940401a668d5ac;hb=5dcddfae63bd26da0f11a8e40f0ae555b5ac624e;hp=a66423121773a8f2419e359b3812dd641640fdd3;hpb=604119a4b22b95e30dea6af3b3bfdc2f07fa4afd;p=~andy%2Flinux

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index a6642312177..81afd1790a1 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,7 +95,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 		memcpy_dir(buf, vaddr, len_this_page, out);
 		scatterwalk_unmap(vaddr, out);
 
-		scatterwalk_advance(walk, nbytes);
+		scatterwalk_advance(walk, len_this_page);
 
 		if (nbytes == len_this_page)
 			break;