diff --git a/[refs] b/[refs]
index bdd03e1cb42a..1aa43ba45f7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 412e87ae5d852bc3d836f475c19d954b3324363d
+refs/heads/master: 4f3e797ad07d52d34983354a77b365dfcd48c1b4
diff --git a/trunk/crypto/scatterwalk.c b/trunk/crypto/scatterwalk.c
index 9aeeb52004a5..3de89a424401 100644
--- a/trunk/crypto/scatterwalk.c
+++ b/trunk/crypto/scatterwalk.c
@@ -54,7 +54,8 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
 		struct page *page;
 
 		page = sg_page(walk->sg) + ((walk->offset - 1) >> PAGE_SHIFT);
-		flush_dcache_page(page);
+		if (!PageSlab(page))
+			flush_dcache_page(page);
 	}
 
 	if (more) {