From da5fbedc4a92efbf73a8f3cfff006f9702fd5119 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 19 May 2010 14:06:29 +1000
Subject: [PATCH] --- yaml --- r: 196735 b: refs/heads/master c:
 85c6201a80ce4464a52c58a5f5ea8de15a557a6f h: refs/heads/master i:   196733:
 dec0c450b0dd7d988c34485bd524290d2de76e85   196731:
 c0bc445566302a4994e495438bceb466a5a21ee4   196727:
 dc50b25d28fb6e3e6d8c085e840b4501ce89e1a5   196719:
 485262439554f208a7aae5caa11334261cf9909b   196703:
 b0c1a5fdadac8cd0d552d863f38806b4d523fe61   196671:
 0cd373e6002cf27a4da717492ddc1b2590d2aca6   196607:
 01bac5e5a8414a3908aa50d1e83fbc56ad7584c3 v: v3

---
 [refs]                     | 2 +-
 trunk/crypto/scatterwalk.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);