mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
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
This commit is contained in:
commit
83f7a2c118
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user