diff --git a/[refs] b/[refs]
index 05c70d13fada..3e1f48262f2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3385329a0a0f1d31ca1d011c7887006a7e5a9902
+refs/heads/master: 85c6201a80ce4464a52c58a5f5ea8de15a557a6f
diff --git a/trunk/crypto/scatterwalk.c b/trunk/crypto/scatterwalk.c
index 3de89a424401..41e529af0773 100644
--- a/trunk/crypto/scatterwalk.c
+++ b/trunk/crypto/scatterwalk.c
@@ -68,7 +68,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
 
 void scatterwalk_done(struct scatter_walk *walk, int out, int more)
 {
-	if (!offset_in_page(walk->offset) || !more)
+	if (!(scatterwalk_pagelen(walk) & (PAGE_SIZE - 1)) || !more)
 		scatterwalk_pagedone(walk, out, more);
 }
 EXPORT_SYMBOL_GPL(scatterwalk_done);