crypto: camellia-x86_64 - module init/exit functions should be static
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Thu, 15 Mar 2012 20:11:51 +0000 (22:11 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 22 Mar 2012 01:17:44 +0000 (09:17 +0800)
This caused conflict with twofish-x86_64-3way 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>
arch/x86/crypto/camellia_glue.c

index 1ca36a93fd2fac577f8c69a2ad8f39cce3229b8a..3306dc0b139e4c3e9b08a0a2689df729fdc9cf3a 100644 (file)
@@ -1925,7 +1925,7 @@ static int force;
 module_param(force, int, 0);
 MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist");
 
-int __init init(void)
+static int __init init(void)
 {
        if (!force && is_blacklisted_cpu()) {
                printk(KERN_INFO
@@ -1938,7 +1938,7 @@ int __init init(void)
        return crypto_register_algs(camellia_algs, ARRAY_SIZE(camellia_algs));
 }
 
-void __exit fini(void)
+static void __exit fini(void)
 {
        crypto_unregister_algs(camellia_algs, ARRAY_SIZE(camellia_algs));
 }