Skip to content

Commit e0db9c4

Browse files
ebiggersherbertx
authored andcommitted
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: 944585a ("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>
1 parent 7ff9036 commit e0db9c4

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

arch/x86/crypto/aesni-intel_glue.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ asmlinkage void aesni_cbc_enc(struct crypto_aes_ctx *ctx, u8 *out,
102102
asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out,
103103
const u8 *in, unsigned int len, u8 *iv);
104104

105-
int crypto_fpu_init(void);
106-
void crypto_fpu_exit(void);
107-
108105
#define AVX_GEN2_OPTSIZE 640
109106
#define AVX_GEN4_OPTSIZE 4096
110107

@@ -1449,13 +1446,9 @@ static int __init aesni_init(void)
14491446
#endif
14501447
#endif
14511448

1452-
err = crypto_fpu_init();
1453-
if (err)
1454-
return err;
1455-
14561449
err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
14571450
if (err)
1458-
goto fpu_exit;
1451+
return err;
14591452

14601453
err = crypto_register_skciphers(aesni_skciphers,
14611454
ARRAY_SIZE(aesni_skciphers));
@@ -1489,8 +1482,6 @@ static int __init aesni_init(void)
14891482
ARRAY_SIZE(aesni_skciphers));
14901483
unregister_algs:
14911484
crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
1492-
fpu_exit:
1493-
crypto_fpu_exit();
14941485
return err;
14951486
}
14961487

@@ -1501,8 +1492,6 @@ static void __exit aesni_exit(void)
15011492
crypto_unregister_skciphers(aesni_skciphers,
15021493
ARRAY_SIZE(aesni_skciphers));
15031494
crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
1504-
1505-
crypto_fpu_exit();
15061495
}
15071496

15081497
late_initcall(aesni_init);

0 commit comments

Comments
 (0)