summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-09 10:06:14 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-09 10:06:14 -0700
commit83f7a2c118833d3738b4d162ea3c17d0bd8ffa94 (patch)
tree450cb68d9341e33c38fed76f75696f4bd60be0e1
parentab875cf67e89eef150ae8d4ef09c361e47b6b398 (diff)
parentf13ba2f7d3a877967477ec8f64e1dae7a967c7e2 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] skcipher: Fix section mismatches
-rw-r--r--crypto/chainiv.c4
-rw-r--r--crypto/eseqiv.c2
-rw-r--r--include/crypto/internal/skcipher.h2
3 files changed, 2 insertions, 6 deletions
diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index 0a7cac6e908..6da3f577e4d 100644
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
@@ -318,10 +318,8 @@ int __init chainiv_module_init(void)
{
return crypto_register_template(&chainiv_tmpl);
}
-EXPORT_SYMBOL_GPL(chainiv_module_init);
-void __exit chainiv_module_exit(void)
+void chainiv_module_exit(void)
{
crypto_unregister_template(&chainiv_tmpl);
}
-EXPORT_SYMBOL_GPL(chainiv_module_exit);
diff --git a/crypto/eseqiv.c b/crypto/eseqiv.c
index 6f2cd063b6f..b14f14e314b 100644
--- a/crypto/eseqiv.c
+++ b/crypto/eseqiv.c
@@ -251,10 +251,8 @@ int __init eseqiv_module_init(void)
{
return crypto_register_template(&eseqiv_tmpl);
}
-EXPORT_SYMBOL_GPL(eseqiv_module_init);
void __exit eseqiv_module_exit(void)
{
crypto_unregister_template(&eseqiv_tmpl);
}
-EXPORT_SYMBOL_GPL(eseqiv_module_exit);
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h
index a8f12644a13..ccc32bad9a8 100644
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -68,7 +68,7 @@ void skcipher_geniv_exit(struct crypto_tfm *tfm);
int __init eseqiv_module_init(void);
void __exit eseqiv_module_exit(void);
int __init chainiv_module_init(void);
-void __exit chainiv_module_exit(void);
+void chainiv_module_exit(void);
static inline struct crypto_ablkcipher *skcipher_geniv_cipher(
struct crypto_ablkcipher *geniv)