arch/s390/lib/crypto/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
From: Eric Biggers <ebiggers@google.com>
When the s390 SHA-256 code is built as a loadable module, name it
sha256-s390.ko instead of sha256.ko. This avoids a module name
collision with crypto/sha256.ko and makes it consistent with the other
architectures.
We should consider making a single module provide all the SHA-256
library code, which would prevent issues like this. But for now this is
the fix that's needed.
Fixes: b9eac03edcf8 ("crypto: s390/sha256 - implement library instead of shash")
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Closes: https://lore.kernel.org/r/20250529110526.6d2959a9.alex.williamson@redhat.com/
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
arch/s390/lib/crypto/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/s390/lib/crypto/Makefile b/arch/s390/lib/crypto/Makefile
index 920197967f463..5df30f1e79307 100644
--- a/arch/s390/lib/crypto/Makefile
+++ b/arch/s390/lib/crypto/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_CRYPTO_CHACHA_S390) += chacha_s390.o
chacha_s390-y := chacha-glue.o chacha-s390.o
-obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256.o
+obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256-s390.o
+sha256-s390-y := sha256.o
base-commit: e0797d3b91de75b6c95b4a0e0649ebd4aac1d9d1
--
2.49.0
Eric Biggers <ebiggers@kernel.org> wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> When the s390 SHA-256 code is built as a loadable module, name it
> sha256-s390.ko instead of sha256.ko. This avoids a module name
> collision with crypto/sha256.ko and makes it consistent with the other
> architectures.
>
> We should consider making a single module provide all the SHA-256
> library code, which would prevent issues like this. But for now this is
> the fix that's needed.
>
> Fixes: b9eac03edcf8 ("crypto: s390/sha256 - implement library instead of shash")
> Reported-by: Alex Williamson <alex.williamson@redhat.com>
> Closes: https://lore.kernel.org/r/20250529110526.6d2959a9.alex.williamson@redhat.com/
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> arch/s390/lib/crypto/Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
© 2016 - 2026 Red Hat, Inc.