Signed-off-by: Kevin Lampis <[email protected]>
---
Changes in v2:
- Remove the unneeded unions
---
xen/arch/x86/include/asm/cpufeature.h | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/xen/arch/x86/include/asm/cpufeature.h
b/xen/arch/x86/include/asm/cpufeature.h
index dcd223d84f..11661a114f 100644
--- a/xen/arch/x86/include/asm/cpufeature.h
+++ b/xen/arch/x86/include/asm/cpufeature.h
@@ -43,29 +43,16 @@
#ifndef __ASSEMBLER__
struct cpuinfo_x86 {
- /* TODO: Phase out the x86 prefixed names. */
union {
struct {
- union {
- uint8_t x86_model;
- uint8_t model;
- };
- union {
- uint8_t x86;
- uint8_t family;
- };
- union {
- uint8_t x86_vendor;
- uint8_t vendor;
- };
+ uint8_t model;
+ uint8_t family;
+ uint8_t vendor;
uint8_t _rsvd; /* Use of this needs coordinating with
VFM_MAKE() */
};
uint32_t vfm; /* Vendor Family Model */
};
- union {
- uint8_t x86_mask;
- uint8_t stepping;
- };
+ uint8_t stepping;
unsigned int cpuid_level; /* Maximum supported CPUID level */
unsigned int extended_cpuid_level; /* Maximum supported CPUID extended
level */
--
2.51.1
