Commit e0db9c48 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

crypto: x86/aes-ni - fix build error following fpu template removal

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: 944585a6 ("crypto: x86/aes-ni - remove special handling of AES in PCBC mode")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7ff9036a
...@@ -102,9 +102,6 @@ asmlinkage void aesni_cbc_enc(struct crypto_aes_ctx *ctx, u8 *out, ...@@ -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, asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out,
const u8 *in, unsigned int len, u8 *iv); 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_GEN2_OPTSIZE 640
#define AVX_GEN4_OPTSIZE 4096 #define AVX_GEN4_OPTSIZE 4096
...@@ -1449,13 +1446,9 @@ static int __init aesni_init(void) ...@@ -1449,13 +1446,9 @@ static int __init aesni_init(void)
#endif #endif
#endif #endif
err = crypto_fpu_init();
if (err)
return err;
err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
if (err) if (err)
goto fpu_exit; return err;
err = crypto_register_skciphers(aesni_skciphers, err = crypto_register_skciphers(aesni_skciphers,
ARRAY_SIZE(aesni_skciphers)); ARRAY_SIZE(aesni_skciphers));
...@@ -1489,8 +1482,6 @@ static int __init aesni_init(void) ...@@ -1489,8 +1482,6 @@ static int __init aesni_init(void)
ARRAY_SIZE(aesni_skciphers)); ARRAY_SIZE(aesni_skciphers));
unregister_algs: unregister_algs:
crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
fpu_exit:
crypto_fpu_exit();
return err; return err;
} }
...@@ -1501,8 +1492,6 @@ static void __exit aesni_exit(void) ...@@ -1501,8 +1492,6 @@ static void __exit aesni_exit(void)
crypto_unregister_skciphers(aesni_skciphers, crypto_unregister_skciphers(aesni_skciphers,
ARRAY_SIZE(aesni_skciphers)); ARRAY_SIZE(aesni_skciphers));
crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
crypto_fpu_exit();
} }
late_initcall(aesni_init); late_initcall(aesni_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment