From 11bdab26297e508fdab29f9457094eedf681de53 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Tue, 14 Jan 2020 10:56:19 +0100 Subject: [PATCH] include/boot/s390.h: add guard for `struct __vector128` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `linux/asm/types.h` also defines the struct `__vector128` so in order to avoid definition conflicts add the macro guard _S390_TYPES_H, which is defined in `linux/asm/types`. `linux/asm/types.h` is included by glib2, which is used by the PV tooling. Reviewed-by: Jan Höppner Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- include/boot/s390.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/boot/s390.h b/include/boot/s390.h index 00eb68e6..704f1dbb 100644 --- a/include/boot/s390.h +++ b/include/boot/s390.h @@ -358,12 +358,17 @@ 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