From: Johannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
To: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Cc: Randy Dunlap <rdunlap@xenotime.net>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
linux-crypto@vger.kernel.org, David Miller <davem@davemloft.net>,
Herbert Xu <herbert@gondor.hengli.com.au>
Subject: Re: linux-next: Tree for Jun 13 (crypto)
Date: Wed, 13 Jun 2012 21:05:40 +0200 [thread overview]
Message-ID: <20120613190540.GY17705@kronos.redsun> (raw)
In-Reply-To: <20120613200317.20733xjrnmv47y04@www.81.fi>
On Wed, Jun 13, 2012 at 08:03:17PM +0300, Jussi Kivilinna wrote:
> >arch/x86/crypto/serpent-avx-x86_64.o: In function `serpent_xts_decrypt':
> >(.text+0x856c): multiple definition of `serpent_xts_decrypt'
> >arch/x86/crypto/serpent-sse2-x86_64.o:(.text+0xae8): first defined here
>
> Reverting commit e2f4d85d5b2049a90859aa10de914ed31a4f17a4, "crypto:
> serpent - add common glue code for avx and sse2 implementation",
> should help for most.
>
> >arch/x86/crypto/serpent-avx-x86_64.o: In function `serpent_dec_blk_8way':
> >(.text+0x3d70): multiple definition of `serpent_dec_blk_8way'
> >arch/x86/crypto/serpent-avx-x86_64.o: In function `__serpent_enc_blk_8way':
> >(.text+0x0): multiple definition of `__serpent_enc_blk_8way'
>
> Attached patch should solve these (patch depends on above revert).
I'm really sorry about this, it shouldn't have happened. The most easiest
solution to this problem would be to make the choice between
CRYPTO_SERPENT_SSE2_X86_64 and CRYPTO_SERPENT_AVX_X86_64 an exclusive-or choice
in crypto/Kconfig. I don't think there is an use-case, where somebody would
want to link both implementations into the same kernel image or even load both
implementations as module. This would avoid duplicating the glue-code again.
Another possibility would be to add a serpent-common-x86_64 module, but this
wouldn't be a trivial change and imo a little bit too much just to avoid
duplicating this code.
- Johannes
next prev parent reply other threads:[~2012-06-13 19:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 5:54 linux-next: Tree for Jun 13 Stephen Rothwell
2012-06-13 16:11 ` linux-next: Tree for Jun 13 (crypto) Randy Dunlap
2012-06-13 16:11 ` Randy Dunlap
2012-06-13 17:03 ` Jussi Kivilinna
2012-06-13 17:03 ` Jussi Kivilinna
2012-06-13 19:05 ` Johannes Goetzfried [this message]
2012-06-13 19:05 ` Johannes Goetzfried
2012-06-13 19:14 ` Jussi Kivilinna
2012-06-13 19:14 ` Jussi Kivilinna
2012-06-14 2:16 ` Herbert Xu
2012-06-14 2:16 ` Herbert Xu
2012-06-13 16:25 ` [PATCH -next] x86: fix apic non-ISO code warnings 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=20120613190540.GY17705@kronos.redsun \
--to=johannes.goetzfried@informatik.stud.uni-erlangen.de \
--cc=davem@davemloft.net \
--cc=herbert@gondor.hengli.com.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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.