See patch 5 for details.  Patch 6 is just an example that demonstrates the fix
working in practice.

Andrew Cooper (6):
  x86/cpu-policy: Drop build time cross-checks of featureset sizes
  x86/cpuid: Rename NCAPINTS to X86_NR_CAPS
  x86/cpuid: Rename FSCAPINTS to X86_NR_FEAT
  x86/cpu-policy: Split cpuid-consts.h out of cpu-policy.h
  x86/cpu-policy: Disentangle X86_NR_FEAT and FEATURESET_NR_ENTRIES
  DO NOT APPLY: Example breakage

 xen/arch/x86/alternative.c             |  2 +-
 xen/arch/x86/cpu-policy.c              | 33 +++++++++++-----------
 xen/arch/x86/cpu/common.c              | 16 +++++------
 xen/arch/x86/cpuid.c                   |  2 +-
 xen/arch/x86/include/asm/cpufeature.h  |  2 +-
 xen/arch/x86/include/asm/cpufeatures.h | 11 +++-----
 xen/arch/x86/include/asm/cpuid.h       |  2 +-
 xen/arch/x86/sysctl.c                  |  8 +++---
 xen/include/xen/lib/x86/cpu-policy.h   | 29 ++++++--------------
 xen/include/xen/lib/x86/cpuid-consts.h | 38 ++++++++++++++++++++++++++
 xen/lib/x86/cpuid.c                    |  8 ++++--
 11 files changed, 88 insertions(+), 63 deletions(-)
 create mode 100644 xen/include/xen/lib/x86/cpuid-consts.h

-- 
2.30.2