summaryrefslogtreecommitdiff
path: root/include/crypto
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2011-11-25 23:14:17 +0800
committerCong Wang <xiyou.wangcong@gmail.com>2012-03-20 21:48:16 +0800
commitf0dfc0b0b7f3d961da8a98bcfccc8be9107a848b (patch)
tree41cd58ad3ed1a96381984ba8047d9887b951f1cb /include/crypto
parent8fd75e1216e0ba601a746177e6c102d5593b572f (diff)
downloadlinux-3.10-f0dfc0b0b7f3d961da8a98bcfccc8be9107a848b.tar.gz
linux-3.10-f0dfc0b0b7f3d961da8a98bcfccc8be9107a848b.tar.bz2
linux-3.10-f0dfc0b0b7f3d961da8a98bcfccc8be9107a848b.zip
crypto: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/scatterwalk.h28
1 files changed, 3 insertions, 25 deletions
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 4fd95a323be..3744d2a642d 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -25,28 +25,6 @@
#include <linux/scatterlist.h>
#include <linux/sched.h>
-static inline enum km_type crypto_kmap_type(int out)
-{
- enum km_type type;
-
- if (in_softirq())
- type = out * (KM_SOFTIRQ1 - KM_SOFTIRQ0) + KM_SOFTIRQ0;
- else
- type = out * (KM_USER1 - KM_USER0) + KM_USER0;
-
- return type;
-}
-
-static inline void *crypto_kmap(struct page *page, int out)
-{
- return kmap_atomic(page, crypto_kmap_type(out));
-}
-
-static inline void crypto_kunmap(void *vaddr, int out)
-{
- kunmap_atomic(vaddr, crypto_kmap_type(out));
-}
-
static inline void crypto_yield(u32 flags)
{
if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
@@ -121,15 +99,15 @@ static inline struct page *scatterwalk_page(struct scatter_walk *walk)
return sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
}
-static inline void scatterwalk_unmap(void *vaddr, int out)
+static inline void scatterwalk_unmap(void *vaddr)
{
- crypto_kunmap(vaddr, out);
+ kunmap_atomic(vaddr);
}
void scatterwalk_start(struct scatter_walk *walk, struct scatterlist *sg);
void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
size_t nbytes, int out);
-void *scatterwalk_map(struct scatter_walk *walk, int out);
+void *scatterwalk_map(struct scatter_walk *walk);
void scatterwalk_done(struct scatter_walk *walk, int out, int more);
void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,