UBUNTU: SAUCE: s390/mm: fix local TLB flushing vs. detach of an mm address space

[mirror_ubuntu-zesty-kernel.git] / crypto / twofish_common.c

diff --git a/crypto/twofish_common.c b/crypto/twofish_common.c
index 0af216c75d7ea8f41666be90c201f757e029ef1b..5f62c4f9f6e0a50f01f86026180fec0cce301305 100644 (file)
--- a/crypto/twofish_common.c
+++ b/crypto/twofish_common.c
@@ -580,12 +580,9 @@ static const u8 calc_sb_tbl[512] = {
    ctx->a[(j) + 1] = rol32(y, 9)
 
 /* Perform the key setup. */
-int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len)
+int __twofish_setkey(struct twofish_ctx *ctx, const u8 *key,
+                    unsigned int key_len, u32 *flags)
 {
-
-       struct twofish_ctx *ctx = crypto_tfm_ctx(tfm);
-       u32 *flags = &tfm->crt_flags;
-
        int i, j, k;
 
        /* Temporaries for CALC_K. */
@@ -701,7 +698,13 @@ int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len)
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(__twofish_setkey);
 
+int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len)
+{
+       return __twofish_setkey(crypto_tfm_ctx(tfm), key, key_len,
+                               &tfm->crt_flags);
+}
 EXPORT_SYMBOL_GPL(twofish_setkey);
 
 MODULE_LICENSE("GPL");