mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
81d358b118
The recently added P10 AES/GCM code added some files containing
CRYPTOGAMS perl-asm code which are near duplicates of the p8 files
found in drivers/crypto/vmx.
In particular the newly added files produce functions with identical
names to the existing code.
When the kernel is built with CONFIG_CRYPTO_AES_GCM_P10=y and
CONFIG_CRYPTO_DEV_VMX_ENCRYPT=y that leads to link errors, eg:
ld: drivers/crypto/vmx/aesp8-ppc.o: in function `aes_p8_set_encrypt_key':
(.text+0xa0): multiple definition of `aes_p8_set_encrypt_key'; arch/powerpc/crypto/aesp8-ppc.o:(.text+0xa0): first defined here
...
ld: drivers/crypto/vmx/ghashp8-ppc.o: in function `gcm_ghash_p8':
(.text+0x140): multiple definition of `gcm_ghash_p8'; arch/powerpc/crypto/ghashp8-ppc.o:(.text+0x2e4): first defined here
Fix it for now by renaming the newly added files and functions to use
"p10" instead of "p8" in the names.
Fixes:
|
||
|---|---|---|
| .. | ||
| aes-gcm-p10-glue.c | ||
| aes-gcm-p10.S | ||
| aes-spe-core.S | ||
| aes-spe-glue.c | ||
| aes-spe-keys.S | ||
| aes-spe-modes.S | ||
| aes-spe-regs.h | ||
| aes-tab-4k.S | ||
| aesp10-ppc.pl | ||
| crc32-vpmsum_core.S | ||
| crc32c-vpmsum_asm.S | ||
| crc32c-vpmsum_glue.c | ||
| crc-vpmsum_test.c | ||
| crct10dif-vpmsum_asm.S | ||
| crct10dif-vpmsum_glue.c | ||
| ghashp10-ppc.pl | ||
| Kconfig | ||
| Makefile | ||
| md5-asm.S | ||
| md5-glue.c | ||
| ppc-xlate.pl | ||
| sha1-powerpc-asm.S | ||
| sha1-spe-asm.S | ||
| sha1-spe-glue.c | ||
| sha1.c | ||
| sha256-spe-asm.S | ||
| sha256-spe-glue.c | ||