kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

include/boot/s390.h: add guard for struct __vector128

Browse Source 
`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 <hoeppner@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Marc Hartmayer
2020-01-14 10:56:19 +01:00
committed by Jan Höppner
parent b06af6026f
commit 11bdab2629
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boot/s390.h
+5
View File
@@ -358,12 +358,17 @@ static __always_inline int is_zvm(void)
return cpuid.version == 0xff; 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 * Vector register definition
*/ */
typedef struct { typedef struct {
uint32_t u[4]; uint32_t u[4];
} __vector128; } __vector128;
#endif
/* /*
* Save vector registers * Save vector registers