Signed-off-by: Kevin Lampis <kevin.lampis@citrix.com>
---
With the first patch for intel.c this now compiles.
https://lore.kernel.org/xen-devel/20251124111942.1325635-1-kevin.lampis@citrix.com/
---
 xen/arch/x86/include/asm/cpufeature.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h
index dcd223d84f..09b1118cea 100644
--- a/xen/arch/x86/include/asm/cpufeature.h
+++ b/xen/arch/x86/include/asm/cpufeature.h
@@ -43,19 +43,15 @@
 #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 _rsvd;             /* Use of this needs coordinating with VFM_MAKE() */
@@ -63,7 +59,6 @@ struct cpuinfo_x86 {
         uint32_t vfm;                  /* Vendor Family Model */
     };
     union {
-        uint8_t x86_mask;
         uint8_t stepping;
     };
 
-- 
2.51.1

On 04.03.2026 20:53, Kevin Lampis wrote:
> --- a/xen/arch/x86/include/asm/cpufeature.h
> +++ b/xen/arch/x86/include/asm/cpufeature.h
> @@ -43,19 +43,15 @@
>  #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 _rsvd;             /* Use of this needs coordinating with VFM_MAKE() */
> @@ -63,7 +59,6 @@ struct cpuinfo_x86 {
>          uint32_t vfm;                  /* Vendor Family Model */
>      };
>      union {
> -        uint8_t x86_mask;
>          uint8_t stepping;
>      };
>  

But then all the now unnecessary unions also want to go away?

Jan