aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/crypto
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2012-03-15 16:11:57 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2012-03-21 21:17:45 -0400
commitff0a70fe053614e763eb3ac88bfea9c5615fce3b (patch)
tree1575b70793ba17c26ebbed08c7799dc9b978d62a /arch/x86/crypto
parent676a38046f4fba4e7418756c6f6fc25cf5976312 (diff)
crypto: twofish-x86_64-3way - module init/exit functions should be static
This caused conflict with camellia-x86_64 when compiled into kernel, same function names and not static. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto')
-rw-r--r--arch/x86/crypto/twofish_glue_3way.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_glue_3way.c
index 408fc0c5814e..922ab24cce31 100644
--- a/arch/x86/crypto/twofish_glue_3way.c
+++ b/arch/x86/crypto/twofish_glue_3way.c
@@ -668,7 +668,7 @@ static int force;
668module_param(force, int, 0); 668module_param(force, int, 0);
669MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); 669MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist");
670 670
671int __init init(void) 671static int __init init(void)
672{ 672{
673 if (!force && is_blacklisted_cpu()) { 673 if (!force && is_blacklisted_cpu()) {
674 printk(KERN_INFO 674 printk(KERN_INFO
@@ -681,7 +681,7 @@ int __init init(void)
681 return crypto_register_algs(tf_algs, ARRAY_SIZE(tf_algs)); 681 return crypto_register_algs(tf_algs, ARRAY_SIZE(tf_algs));
682} 682}
683 683
684void __exit fini(void) 684static void __exit fini(void)
685{ 685{
686 crypto_unregister_algs(tf_algs, ARRAY_SIZE(tf_algs)); 686 crypto_unregister_algs(tf_algs, ARRAY_SIZE(tf_algs));
687} 687}