]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
crypto: x86/aes-ni - fix build error following fpu template removal
authorEric Biggers <ebiggers@google.com>
Fri, 5 Oct 2018 17:13:06 +0000 (10:13 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 8 Oct 2018 05:47:02 +0000 (13:47 +0800)
aesni-intel_glue.c still calls crypto_fpu_init() and crypto_fpu_exit()
to register/unregister the "fpu" template.  But these functions don't
exist anymore, causing a build error.  Remove the calls to them.

Fixes: 944585a64f5e ("crypto: x86/aes-ni - remove special handling of AES in PCBC mode")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/x86/crypto/aesni-intel_glue.c

index 89bae64eef4f9c49fdaaa07e6bd6cec89cce2148..661f7daf43da947acccfffe5b820ef7cebe7009c 100644 (file)
@@ -102,9 +102,6 @@ asmlinkage void aesni_cbc_enc(struct crypto_aes_ctx *ctx, u8 *out,
 asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out,
                              const u8 *in, unsigned int len, u8 *iv);
 
-int crypto_fpu_init(void);
-void crypto_fpu_exit(void);
-
 #define AVX_GEN2_OPTSIZE 640
 #define AVX_GEN4_OPTSIZE 4096
 
@@ -1449,13 +1446,9 @@ static int __init aesni_init(void)
 #endif
 #endif
 
-       err = crypto_fpu_init();
-       if (err)
-               return err;
-
        err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
        if (err)
-               goto fpu_exit;
+               return err;
 
        err = crypto_register_skciphers(aesni_skciphers,
                                        ARRAY_SIZE(aesni_skciphers));
@@ -1489,8 +1482,6 @@ unregister_skciphers:
                                    ARRAY_SIZE(aesni_skciphers));
 unregister_algs:
        crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
-fpu_exit:
-       crypto_fpu_exit();
        return err;
 }
 
@@ -1501,8 +1492,6 @@ static void __exit aesni_exit(void)
        crypto_unregister_skciphers(aesni_skciphers,
                                    ARRAY_SIZE(aesni_skciphers));
        crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
-
-       crypto_fpu_exit();
 }
 
 late_initcall(aesni_init);