From a49887de1facbbf87db464c845b078653559ad1d Mon Sep 17 00:00:00 2001 From: Sertonix Date: Tue, 28 Oct 2025 20:36:12 +0100 Subject: [PATCH] include/boot/s390.h: Always use __vector128 from asm/types.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit asm/types.h may be included after the guard. This happens eg. when compiling with musl libc. When including the header directly the include is always there and the fallback __vector128 is not needed anymore. The guard was introduced by commit 11bdab26297e ("include/boot/s390.h: add guard for `struct __vector128`") Github-ID: https://github.com/ibm-s390-linux/s390-tools/pull/193 Signed-off-by: Sertonix Reviewed-by: Steffen Eiden [hoeppner@linux.ibm.com: Adapt commit message] Reviewed-by: Jan Höppner Signed-off-by: Jan Höppner --- include/boot/s390.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/include/boot/s390.h b/include/boot/s390.h index 1cc01b99..2d1dfa5c 100644 --- a/include/boot/s390.h +++ b/include/boot/s390.h @@ -29,6 +29,7 @@ #define UNPACK_FACILITY _AC(161, U) #ifndef __ASSEMBLER__ +#include #include /* @@ -380,18 +381,6 @@ static __always_inline int is_zvm(void) return cpuid.version == 0xff; } -/* To avoid conflicts add a macro guard since __vector128 is also - * defined in 'linux/asm/types.h'. - */ -#ifndef _S390_TYPES_H -/* - * Vector register definition - */ -typedef struct { - uint32_t u[4]; -} __vector128; -#endif - /* * Save vector registers */