Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 676a3804 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files

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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2dc9b5db

arch/x86/crypto/camellia_glue.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

}