From 8821d26926ea6c1115974a989ec5a467da402f4f Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 17 Apr 2025 20:59:09 -0700 Subject: [PATCH] crypto: lib/chacha - restore ability to remove modules Though the module_exit functions are now no-ops, they should still be defined, since otherwise the modules become unremovable. Fixes: 08820553f33a ("crypto: arm/chacha - remove the redundant skcipher algorithms") Fixes: 8c28abede16c ("crypto: arm64/chacha - remove the skcipher algorithms") Fixes: f7915484c020 ("crypto: powerpc/chacha - remove the skcipher algorithms") Fixes: ceba0eda8313 ("crypto: riscv/chacha - implement library instead of skcipher") Fixes: 632ab0978f08 ("crypto: x86/chacha - remove the skcipher algorithms") Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu --- arch/arm/crypto/chacha-glue.c | 5 +++++ arch/arm64/crypto/chacha-neon-glue.c | 5 +++++ arch/powerpc/crypto/chacha-p10-glue.c | 5 +++++ arch/riscv/crypto/chacha-riscv64-glue.c | 5 +++++ arch/x86/crypto/chacha_glue.c | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c index 3a5c75c95d43b..12afb40cf1ff4 100644 --- a/arch/arm/crypto/chacha-glue.c +++ b/arch/arm/crypto/chacha-glue.c @@ -124,6 +124,11 @@ static int __init chacha_arm_mod_init(void) } arch_initcall(chacha_arm_mod_init); +static void __exit chacha_arm_mod_exit(void) +{ +} +module_exit(chacha_arm_mod_exit); + MODULE_DESCRIPTION("ChaCha and HChaCha functions (ARM optimized)"); MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL v2"); diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/crypto/chacha-neon-glue.c index a0c336b284027..14a2836eff611 100644 --- a/arch/arm64/crypto/chacha-neon-glue.c +++ b/arch/arm64/crypto/chacha-neon-glue.c @@ -106,6 +106,11 @@ static int __init chacha_simd_mod_init(void) } arch_initcall(chacha_simd_mod_init); +static void __exit chacha_simd_mod_exit(void) +{ +} +module_exit(chacha_simd_mod_exit); + MODULE_DESCRIPTION("ChaCha and HChaCha functions (ARM64 optimized)"); MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL v2"); diff --git a/arch/powerpc/crypto/chacha-p10-glue.c b/arch/powerpc/crypto/chacha-p10-glue.c index 9982929573add..351ed409f9b21 100644 --- a/arch/powerpc/crypto/chacha-p10-glue.c +++ b/arch/powerpc/crypto/chacha-p10-glue.c @@ -89,6 +89,11 @@ static int __init chacha_p10_init(void) } arch_initcall(chacha_p10_init); +static void __exit chacha_p10_exit(void) +{ +} +module_exit(chacha_p10_exit); + MODULE_DESCRIPTION("ChaCha stream cipher (P10 accelerated)"); MODULE_AUTHOR("Danny Tsen "); MODULE_LICENSE("GPL v2"); diff --git a/arch/riscv/crypto/chacha-riscv64-glue.c b/arch/riscv/crypto/chacha-riscv64-glue.c index ccaab0dea383f..afc4e3be3cac2 100644 --- a/arch/riscv/crypto/chacha-riscv64-glue.c +++ b/arch/riscv/crypto/chacha-riscv64-glue.c @@ -64,6 +64,11 @@ static int __init riscv64_chacha_mod_init(void) } arch_initcall(riscv64_chacha_mod_init); +static void __exit riscv64_chacha_mod_exit(void) +{ +} +module_exit(riscv64_chacha_mod_exit); + MODULE_DESCRIPTION("ChaCha stream cipher (RISC-V optimized)"); MODULE_AUTHOR("Jerry Shih "); MODULE_LICENSE("GPL"); diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c index fcc14c006bdeb..59bf63c000726 100644 --- a/arch/x86/crypto/chacha_glue.c +++ b/arch/x86/crypto/chacha_glue.c @@ -176,6 +176,11 @@ static int __init chacha_simd_mod_init(void) } arch_initcall(chacha_simd_mod_init); +static void __exit chacha_simd_mod_exit(void) +{ +} +module_exit(chacha_simd_mod_exit); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Martin Willi "); MODULE_DESCRIPTION("ChaCha and HChaCha functions (x86_64 optimized)"); -- 2.50.1