From: Randy Dunlap <rdunlap@xenotime.net>
To: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] crypto: camellia-x86_64 - module init/exit functions should be static
Date: Thu, 15 Mar 2012 15:49:37 -0700 [thread overview]
Message-ID: <4F627201.3080100@xenotime.net> (raw)
In-Reply-To: <20120315201151.11667.63183.stgit@localhost6.localdomain6>
On 03/15/2012 01:11 PM, Jussi Kivilinna wrote:
> This caused conflict with twofish-x86_64-3way when compiled into kernel,
> same function names and not static.
>
> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
> arch/x86/crypto/camellia_glue.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c
> index 1ca36a9..3306dc0 100644
> --- a/arch/x86/crypto/camellia_glue.c
> +++ b/arch/x86/crypto/camellia_glue.c
> @@ -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));
> }
>
--
~Randy
next prev parent reply other threads:[~2012-03-15 22:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120315185935.a0c475a30b2836765273a1e5@canb.auug.org.au>
2012-03-15 15:48 ` linux-next: Tree for Mar 15 (crypto) Randy Dunlap
2012-03-15 20:05 ` Jussi Kivilinna
2012-03-15 20:11 ` [PATCH 1/2] crypto: camellia-x86_64 - module init/exit functions should be static Jussi Kivilinna
2012-03-15 22:49 ` Randy Dunlap [this message]
2012-03-22 0:40 ` Randy Dunlap
2012-03-22 0:46 ` Herbert Xu
2012-03-22 21:18 ` H. Peter Anvin
2012-03-23 0:42 ` Herbert Xu
2012-03-15 20:11 ` [PATCH 2/2] crypto: twofish-x86_64-3way " Jussi Kivilinna
2012-03-15 22:49 ` Randy Dunlap
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=4F627201.3080100@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=herbert@gondor.apana.org.au \
--cc=jussi.kivilinna@mbnet.fi \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).