forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
2dc9b5dbde
commit
676a38046f
|
@ -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));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user