aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/crypto/aesni-intel_glue.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 89bae64eef4f..661f7daf43da 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -102,9 +102,6 @@ asmlinkage void aesni_cbc_enc(struct crypto_aes_ctx *ctx, u8 *out,
102asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out, 102asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out,
103 const u8 *in, unsigned int len, u8 *iv); 103 const u8 *in, unsigned int len, u8 *iv);
104 104
105int crypto_fpu_init(void);
106void crypto_fpu_exit(void);
107
108#define AVX_GEN2_OPTSIZE 640 105#define AVX_GEN2_OPTSIZE 640
109#define AVX_GEN4_OPTSIZE 4096 106#define AVX_GEN4_OPTSIZE 4096
110 107
@@ -1449,13 +1446,9 @@ static int __init aesni_init(void)
1449#endif 1446#endif
1450#endif 1447#endif
1451 1448
1452 err = crypto_fpu_init();
1453 if (err)
1454 return err;
1455
1456 err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); 1449 err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
1457 if (err) 1450 if (err)
1458 goto fpu_exit; 1451 return err;
1459 1452
1460 err = crypto_register_skciphers(aesni_skciphers, 1453 err = crypto_register_skciphers(aesni_skciphers,
1461 ARRAY_SIZE(aesni_skciphers)); 1454 ARRAY_SIZE(aesni_skciphers));
@@ -1489,8 +1482,6 @@ unregister_skciphers:
1489 ARRAY_SIZE(aesni_skciphers)); 1482 ARRAY_SIZE(aesni_skciphers));
1490unregister_algs: 1483unregister_algs:
1491 crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); 1484 crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
1492fpu_exit:
1493 crypto_fpu_exit();
1494 return err; 1485 return err;
1495} 1486}
1496 1487
@@ -1501,8 +1492,6 @@ static void __exit aesni_exit(void)
1501 crypto_unregister_skciphers(aesni_skciphers, 1492 crypto_unregister_skciphers(aesni_skciphers,
1502 ARRAY_SIZE(aesni_skciphers)); 1493 ARRAY_SIZE(aesni_skciphers));
1503 crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); 1494 crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
1504
1505 crypto_fpu_exit();
1506} 1495}
1507 1496
1508late_initcall(aesni_init); 1497late_initcall(aesni_init);