Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 226f7cea authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Fix build with mix of modular vs. non-modular crypto drivers. 



We tried linking in a single built object to hold the device table,
but only works if all of the sparc64 crypto modules get built the same
way (modular vs. non-modular).

Just include the device ID stub into each driver source file so that
the table gets compiled into the correct result in all cases.

Reported-by: default avatarMeelis Roos <mroos@linux.ee>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 193d2aad

arch/sparc/crypto/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ obj-$(CONFIG_CRYPTO_DES_SPARC64) += camellia-sparc64.o 


obj-$(CONFIG_CRYPTO_CRC32C_SPARC64) += crc32c-sparc64.o



sha1-sparc64-y := sha1_asm.o sha1_glue.o crop_devid.o

sha256-sparc64-y := sha256_asm.o sha256_glue.o crop_devid.o

sha512-sparc64-y := sha512_asm.o sha512_glue.o crop_devid.o

md5-sparc64-y := md5_asm.o md5_glue.o crop_devid.o

sha1-sparc64-y := sha1_asm.o sha1_glue.o

sha256-sparc64-y := sha256_asm.o sha256_glue.o

sha512-sparc64-y := sha512_asm.o sha512_glue.o

md5-sparc64-y := md5_asm.o md5_glue.o



aes-sparc64-y := aes_asm.o aes_glue.o crop_devid.o

des-sparc64-y := des_asm.o des_glue.o crop_devid.o

camellia-sparc64-y := camellia_asm.o camellia_glue.o crop_devid.o

aes-sparc64-y := aes_asm.o aes_glue.o

des-sparc64-y := des_asm.o des_glue.o

camellia-sparc64-y := camellia_asm.o camellia_glue.o



crc32c-sparc64-y := crc32c_asm.o crc32c_glue.o crop_devid.o
 
crc32c-sparc64-y := crc32c_asm.o crc32c_glue.o

arch/sparc/crypto/aes_glue.c

+2 −0
Original line number Diff line number Diff line
@@ -475,3 +475,5 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated");



MODULE_ALIAS("aes");



#include "crop_devid.c"

arch/sparc/crypto/camellia_glue.c

+2 −0
Original line number Diff line number Diff line
@@ -320,3 +320,5 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated");



MODULE_ALIAS("aes");



#include "crop_devid.c"

arch/sparc/crypto/crc32c_glue.c

+2 −0
Original line number Diff line number Diff line
@@ -177,3 +177,5 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated");



MODULE_ALIAS("crc32c");



#include "crop_devid.c"

arch/sparc/crypto/des_glue.c

+2 −0
Original line number Diff line number Diff line
@@ -527,3 +527,5 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms, sparc64 des opcode accelerated");



MODULE_ALIAS("des");



#include "crop_devid.c"