From: Heiko Carstens Date: Wed, 4 Sep 2024 09:39:23 +0000 (+0200) Subject: s390/boot: Increase minimum architecture to z10 X-Git-Tag: v6.12-rc1~113^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db545f5387472176cf1e7df76fe97a4f56b7158d;p=thirdparty%2Fkernel%2Flinux.git s390/boot: Increase minimum architecture to z10 The decompressor code is partially compiled with march=z900 so it is possible to print an error message in case a kernel is booted on a machine which misses facilities to execute the kernel. Given that the decompressor code also includes header files from the core kernel this causes problems for inline assemblies and other code where the minimum assumed architecture level is set to z10 in the meantime. If such code is also used in the decompressor (e.g. inline functions) z900 support must be implemented again. In order to avoid this and to keep things simple just raise the minimum architecture level to z10 for the decompressor just like for the kernel. Reviewed-by: Sven Schnelle Signed-off-by: Heiko Carstens --- diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile index b2252bb15445c..df01e7be1560f 100644 --- a/arch/s390/boot/Makefile +++ b/arch/s390/boot/Makefile @@ -18,11 +18,7 @@ KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) # Use minimum architecture for als.c to be able to print an error # message if the kernel is started on a machine which is too old # -ifndef CONFIG_CC_IS_CLANG -CC_FLAGS_MARCH_MINIMUM := -march=z900 -else CC_FLAGS_MARCH_MINIMUM := -march=z10 -endif ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM)) AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH)