dm mpath: emc fix an error message

[pandora-kernel.git] / crypto / internal.h

diff --git a/crypto/internal.h b/crypto/internal.h
index 03c00b0..abb01f7 100644 (file)
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -50,11 +50,16 @@ extern struct list_head crypto_alg_list;
 extern struct rw_semaphore crypto_alg_sem;
 extern struct blocking_notifier_head crypto_chain;
 
-extern enum km_type crypto_km_types[];
-
 static inline enum km_type crypto_kmap_type(int out)
 {
-       return crypto_km_types[(in_softirq() ? 2 : 0) + 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)
@@ -67,25 +72,12 @@ static inline void crypto_kunmap(void *vaddr, int out)
        kunmap_atomic(vaddr, crypto_kmap_type(out));
 }
 
-static inline void crypto_yield(struct crypto_tfm *tfm)
+static inline void crypto_yield(u32 flags)
 {
-       if (tfm->crt_flags & CRYPTO_TFM_REQ_MAY_SLEEP)
+       if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
                cond_resched();
 }
 
-#ifdef CONFIG_CRYPTO_HMAC
-int crypto_alloc_hmac_block(struct crypto_tfm *tfm);
-void crypto_free_hmac_block(struct crypto_tfm *tfm);
-#else
-static inline int crypto_alloc_hmac_block(struct crypto_tfm *tfm)
-{
-       return 0;
-}
-
-static inline void crypto_free_hmac_block(struct crypto_tfm *tfm)
-{ }
-#endif
-
 #ifdef CONFIG_PROC_FS
 void __init crypto_init_proc(void);
 void __exit crypto_exit_proc(void);
@@ -96,42 +88,32 @@ static inline void crypto_exit_proc(void)
 { }
 #endif
 
-static inline unsigned int crypto_digest_ctxsize(struct crypto_alg *alg,
-                                                int flags)
-{
-       return alg->cra_ctxsize;
-}
-
-static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg,
-                                                int flags)
+static inline unsigned int crypto_digest_ctxsize(struct crypto_alg *alg)
 {
        unsigned int len = alg->cra_ctxsize;
-       
-       switch (flags & CRYPTO_TFM_MODE_MASK) {
-       case CRYPTO_TFM_MODE_CBC:
+
+       if (alg->cra_alignmask) {
                len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1);
-               len += alg->cra_blocksize;
-               break;
+               len += alg->cra_digest.dia_digestsize;
        }
 
        return len;
 }
 
-static inline unsigned int crypto_compress_ctxsize(struct crypto_alg *alg,
-                                                  int flags)
+static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg)
+{
+       return alg->cra_ctxsize;
+}
+
+static inline unsigned int crypto_compress_ctxsize(struct crypto_alg *alg)
 {
        return alg->cra_ctxsize;
 }
 
 struct crypto_alg *crypto_mod_get(struct crypto_alg *alg);
-void crypto_mod_put(struct crypto_alg *alg);
 struct crypto_alg *__crypto_alg_lookup(const char *name, u32 type, u32 mask);
 struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask);
 
-int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags);
-int crypto_init_cipher_flags(struct crypto_tfm *tfm, u32 flags);
-int crypto_init_compress_flags(struct crypto_tfm *tfm, u32 flags);
-
 int crypto_init_digest_ops(struct crypto_tfm *tfm);
 int crypto_init_cipher_ops(struct crypto_tfm *tfm);
 int crypto_init_compress_ops(struct crypto_tfm *tfm);
@@ -143,7 +125,8 @@ void crypto_exit_compress_ops(struct crypto_tfm *tfm);
 void crypto_larval_error(const char *name, u32 type, u32 mask);
 
 void crypto_shoot_alg(struct crypto_alg *alg);
-struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 flags);
+struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,
+                                     u32 mask);
 
 int crypto_register_instance(struct crypto_template *tmpl,
                             struct crypto_instance *inst);