ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

crypto: camellia-x86_64 - module init/exit functions should be static

Browse Source 
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:
Jussi Kivilinna
2012-03-15 22:11:51 +02:00
committed by Herbert Xu
parent 2dc9b5dbde
commit 676a38046f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/crypto/camellia_glue.c
View File

@@ -1925,7 +1925,7 @@ static int force;
module_param(force, int, 0); module_param(force, int, 0);
MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist");
int __init init(void) static int __init init(void)
{ {
if (!force && is_blacklisted_cpu()) { if (!force && is_blacklisted_cpu()) {
printk(KERN_INFO printk(KERN_INFO
@@ -1938,7 +1938,7 @@ int __init init(void)
return crypto_register_algs(camellia_algs, ARRAY_SIZE(camellia_algs)); 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)); crypto_unregister_algs(camellia_algs, ARRAY_SIZE(camellia_algs));
} }