dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes a build problem where two crypto modules both try to export
  the same symbols (which shouldn't have been exported in the first
  place)."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: twofish-x86_64-3way - module init/exit functions should be static
  crypto: camellia-x86_64 - module init/exit functions should be static
This commit is contained in:
Linus Torvalds 2012-03-22 20:19:30 -07:00
parent d4c6fa73fe ff0a70fe05
commit 6a76a69923
2 changed files with 4 additions and 4 deletions
Show Stats 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));
} }

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

@ -668,7 +668,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
@ -681,7 +681,7 @@ int __init init(void)
return crypto_register_algs(tf_algs, ARRAY_SIZE(tf_algs)); 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)); crypto_unregister_algs(tf_algs, ARRAY_SIZE(tf_algs));
} }