linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Randy Dunlap <rdunlap@xenotime.net>,
	linux-next@vger.kernel.org, linux-crypto@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] crypto: twofish-x86_64-3way - module init/exit functions should be static
Date: Thu, 15 Mar 2012 22:11:57 +0200	[thread overview]
Message-ID: <20120315201157.11667.30754.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <4F620F37.4070404@xenotime.net>

This caused conflict with camellia-x86_64 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>
---
 arch/x86/crypto/twofish_glue_3way.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_glue_3way.c
index 408fc0c..922ab24 100644
--- a/arch/x86/crypto/twofish_glue_3way.c
+++ b/arch/x86/crypto/twofish_glue_3way.c
@@ -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));
 }

  parent reply	other threads:[~2012-03-15 20:11 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-15  7:59 linux-next: Tree for Mar 15 Stephen Rothwell
2012-03-15  8:02 ` Geert Uytterhoeven
2012-03-15  8:17   ` Stephen Rothwell
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
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   ` Jussi Kivilinna [this message]
2012-03-15 22:49     ` [PATCH 2/2] crypto: twofish-x86_64-3way " Randy Dunlap
2012-03-15 15:58 ` linux-next: Tree for Mar 15 (staging/android/ram_console.c) Randy Dunlap
2012-03-15 21:03   ` Greg Kroah-Hartman
2012-03-15 21:39     ` 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=20120315201157.11667.30754.stgit@localhost6.localdomain6 \
    --to=jussi.kivilinna@mbnet.fi \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    --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).