diff options
author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2012-03-15 16:11:51 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-03-21 21:17:44 -0400 |
commit | 676a38046f4fba4e7418756c6f6fc25cf5976312 (patch) | |
tree | 0775b953b23538b7c989ae1b14e9aced39b1bf41 /arch/x86/crypto | |
parent | 2dc9b5dbdef09840de852a4f0cc6a9c9eece7220 (diff) |
crypto: camellia-x86_64 - module init/exit functions should be static
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>
Diffstat (limited to 'arch/x86/crypto')
-rw-r--r-- | arch/x86/crypto/camellia_glue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c index 1ca36a93fd2f..3306dc0b139e 100644 --- a/arch/x86/crypto/camellia_glue.c +++ b/arch/x86/crypto/camellia_glue.c | |||
@@ -1925,7 +1925,7 @@ static int force; | |||
1925 | module_param(force, int, 0); | 1925 | module_param(force, int, 0); |
1926 | MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); | 1926 | MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); |
1927 | 1927 | ||
1928 | int __init init(void) | 1928 | static int __init init(void) |
1929 | { | 1929 | { |
1930 | if (!force && is_blacklisted_cpu()) { | 1930 | if (!force && is_blacklisted_cpu()) { |
1931 | printk(KERN_INFO | 1931 | printk(KERN_INFO |
@@ -1938,7 +1938,7 @@ int __init init(void) | |||
1938 | return crypto_register_algs(camellia_algs, ARRAY_SIZE(camellia_algs)); | 1938 | return crypto_register_algs(camellia_algs, ARRAY_SIZE(camellia_algs)); |
1939 | } | 1939 | } |
1940 | 1940 | ||
1941 | void __exit fini(void) | 1941 | static void __exit fini(void) |
1942 | { | 1942 | { |
1943 | crypto_unregister_algs(camellia_algs, ARRAY_SIZE(camellia_algs)); | 1943 | crypto_unregister_algs(camellia_algs, ARRAY_SIZE(camellia_algs)); |
1944 | } | 1944 | } |