UPSTREAM: USB: option: add Huawei E5331

[cascardo/linux.git] / crypto / scatterwalk.c

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 41e529a..7281b8a 100644 (file)
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -40,9 +40,9 @@ void scatterwalk_start(struct scatter_walk *walk, struct scatterlist *sg)
 }
 EXPORT_SYMBOL_GPL(scatterwalk_start);
 
-void *scatterwalk_map(struct scatter_walk *walk, int out)
+void *scatterwalk_map(struct scatter_walk *walk)
 {
-       return crypto_kmap(scatterwalk_page(walk), out) +
+       return kmap_atomic(scatterwalk_page(walk)) +
               offset_in_page(walk->offset);
 }
 EXPORT_SYMBOL_GPL(scatterwalk_map);
@@ -83,9 +83,9 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
                if (len_this_page > nbytes)
                        len_this_page = nbytes;
 
-               vaddr = scatterwalk_map(walk, out);
+               vaddr = scatterwalk_map(walk);
                memcpy_dir(buf, vaddr, len_this_page, out);
-               scatterwalk_unmap(vaddr, out);
+               scatterwalk_unmap(vaddr);
 
                scatterwalk_advance(walk, len_this_page);