From: Adrian Bunk <bunk@kernel.org>
To: Herbert Xu <herbert@gondor.apana.org.au>, davem@davemloft.net
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [2.6.25 patch] crypto/ section fixes
Date: Sat, 8 Mar 2008 23:51:40 +0200 [thread overview]
Message-ID: <20080308215140.GC12621@cs181133002.pp.htv.fi> (raw)
This patch fixes the following issues introduced by
commit 76fc60a2e3c6aa6e98cd3a5cb81a1855c637b274:
- the exports of {chainiv,eseqiv}_module_{init,exit} are unneeded
- calling {chainiv,eseqiv}_module_init from a module would anyway have
resulted in an Oops
- chainiv_module_exit() mustn't be exit since it's now called from
the __init blkcipher_module_init()
On architectures that discard __exit code at build time these issues led
to build errors.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
crypto/chainiv.c | 4 +---
crypto/eseqiv.c | 2 --
include/crypto/internal/skcipher.h | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
320c91127c5a53a109feda13c9e29c72df0edac0 foobar
diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index 0a7cac6..6da3f57 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 6f2cd06..b14f14e 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 a8f1264..ccc32ba 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)
next reply other threads:[~2008-03-08 21:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-08 21:51 Adrian Bunk [this message]
2008-03-09 1:08 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080308215140.GC12621@cs181133002.pp.htv.fi \
--to=bunk@kernel.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®