Commit 8821d269 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

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: 08820553 ("crypto: arm/chacha - remove the redundant skcipher algorithms")
Fixes: 8c28abed ("crypto: arm64/chacha - remove the skcipher algorithms")
Fixes: f7915484 ("crypto: powerpc/chacha - remove the skcipher algorithms")
Fixes: ceba0eda ("crypto: riscv/chacha - implement library instead of skcipher")
Fixes: 632ab097 ("crypto: x86/chacha - remove the skcipher algorithms")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 31b20bc2

arch/arm/crypto/chacha-glue.c

+5 −0
Original line number Diff line number Diff line
@@ -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 <ard.biesheuvel@linaro.org>");

MODULE_LICENSE("GPL v2");

arch/arm64/crypto/chacha-neon-glue.c

+5 −0
Original line number Diff line number Diff line
@@ -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 <ard.biesheuvel@linaro.org>");

MODULE_LICENSE("GPL v2");

arch/powerpc/crypto/chacha-p10-glue.c

+5 −0
Original line number Diff line number Diff line
@@ -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 <dtsen@linux.ibm.com>");

MODULE_LICENSE("GPL v2");

arch/riscv/crypto/chacha-riscv64-glue.c

+5 −0
Original line number Diff line number Diff line
@@ -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 <jerry.shih@sifive.com>");

MODULE_LICENSE("GPL");

arch/x86/crypto/chacha_glue.c

+5 −0
Original line number Diff line number Diff line
@@ -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 <martin@strongswan.org>");

MODULE_DESCRIPTION("ChaCha and HChaCha functions (x86_64 optimized)");