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

Commit 6a76a699 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d4c6fa73 ff0a70fe

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));

}

arch/x86/crypto/twofish_glue_3way.c

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

}