From: Andrew Morton Fix rejects between git-x86 and git-cryptodev Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Herbert Xu Signed-off-by: Andrew Morton --- arch/s390/crypto/aes_s390.c | 6 +----- arch/x86/crypto/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff -puN arch/x86/crypto/Makefile~git-cryptodev-fixup arch/x86/crypto/Makefile --- a/arch/x86/crypto/Makefile~git-cryptodev-fixup +++ a/arch/x86/crypto/Makefile @@ -8,8 +8,8 @@ obj-$(CONFIG_CRYPTO_TWOFISH_586) += twof obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o -aes-i586-y := aes-i586-asm_32.o aes_32.o +aes-i586-y := aes-i586-asm_32.o aes_glue.o twofish-i586-y := twofish-i586-asm_32.o twofish.o -aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o +aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o twofish-x86_64-y := twofish-x86_64-asm_64.o twofish.o diff -puN arch/s390/crypto/aes_s390.c~git-cryptodev-fixup arch/s390/crypto/aes_s390.c --- a/arch/s390/crypto/aes_s390.c~git-cryptodev-fixup +++ a/arch/s390/crypto/aes_s390.c @@ -520,14 +520,10 @@ static int __init aes_init(void) return -EOPNOTSUPP; /* z9 109 and z9 BC/EC only support 128 bit key length */ - if (keylen_flag == AES_KEYLEN_128) { - aes_alg.cra_u.cipher.cia_max_keysize = AES_MIN_KEY_SIZE; - ecb_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE; - cbc_aes_alg.cra_u.blkcipher.max_keysize = AES_MIN_KEY_SIZE; + if (keylen_flag == AES_KEYLEN_128) printk(KERN_INFO "aes_s390: hardware acceleration only available for " "128 bit keys\n"); - } ret = crypto_register_alg(&aes_alg); if (ret) _