diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2012-03-15 22:11:57 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-03-22 09:17:45 +0800 |
| commit | ff0a70fe053614e763eb3ac88bfea9c5615fce3b (patch) | |
| tree | 1575b70793ba17c26ebbed08c7799dc9b978d62a | |
| parent | 676a38046f4fba4e7418756c6f6fc25cf5976312 (diff) | |
| download | linux-3.10-ff0a70fe053614e763eb3ac88bfea9c5615fce3b.tar.gz linux-3.10-ff0a70fe053614e763eb3ac88bfea9c5615fce3b.tar.bz2 linux-3.10-ff0a70fe053614e763eb3ac88bfea9c5615fce3b.zip | |
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>
| -rw-r--r-- | arch/x86/crypto/twofish_glue_3way.c | 4 |
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 408fc0c5814..922ab24cce3 100644 --- a/arch/x86/crypto/twofish_glue_3way.c +++ b/arch/x86/crypto/twofish_glue_3way.c @@ -668,7 +668,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 @@ -681,7 +681,7 @@ int __init init(void) return crypto_register_algs(tf_algs, ARRAY_SIZE(tf_algs)); } -void __exit fini(void) +static void __exit fini(void) { crypto_unregister_algs(tf_algs, ARRAY_SIZE(tf_algs)); } |