4 files changed, 6 insertions, 5 deletions

diff --git a/crypto/digest.c b/crypto/digest.c
index 52845f53f8e1..6fd43bddd545 100644
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -75,7 +75,7 @@ static int update2(struct hash_desc *desc,
 
                 if (!nbytes)
                         break;
-                sg = sg_next(sg);
+                sg = scatterwalk_sg_next(sg);
         }
 
         return 0;
diff --git a/crypto/gcm.c b/crypto/gcm.c
index 27483f361e80..502da929a5fc 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -100,7 +100,7 @@ static void crypto_gcm_ghash_update_sg(struct crypto_gcm_ghash_ctx *ctx,
                 n = scatterwalk_clamp(&walk, len);
 
                 if (!n) {
-                        scatterwalk_start(&walk, sg_next(walk.sg));
+                        scatterwalk_start(&walk, scatterwalk_sg_next(walk.sg));
                         n = scatterwalk_clamp(&walk, len);
                 }
 
diff --git a/crypto/hmac.c b/crypto/hmac.c
index 34c3706db85d..a1d016a50e7d 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -17,6 +17,7 @@
  */
 
 #include <crypto/algapi.h>
+#include <crypto/scatterwalk.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -160,7 +161,7 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
 
         sg_init_table(sg1, 2);
         sg_set_buf(sg1, ipad, bs);
-        sg_chain(sg1, 2, sg);
+        scatterwalk_sg_chain(sg1, 2, sg);
 
         sg_init_table(sg2, 1);
         sg_set_buf(sg2, opad, bs + ds);
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 12d19019e178..297e19d13c4e 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -61,7 +61,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
                 walk->offset += PAGE_SIZE - 1;
                 walk->offset &= PAGE_MASK;
                 if (walk->offset >= walk->sg->offset + walk->sg->length)
-                        scatterwalk_start(walk, sg_next(walk->sg));
+                        scatterwalk_start(walk, scatterwalk_sg_next(walk->sg));
         }
 }
 
@@ -112,7 +112,7 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
                         break;
 
                 offset += sg->length;
-                sg = sg_next(sg);
+                sg = scatterwalk_sg_next(sg);
         }
 
         scatterwalk_advance(&walk, start - offset);