diff options
author | 2024-04-06 13:00:32 +0200 | |
---|---|---|
committer | 2024-04-06 13:00:32 +0200 | |
commit | 5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9 (patch) | |
tree | 0475ba937cecc36b1e38afcd0f3babba23092aba /arch/x86/kvm/reverse_cpuid.h | |
parent | x86/mce: Make sure to grab mce_sysfs_mutex in set_bank() (diff) | |
parent | Merge tag 'firewire-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
download | linux-5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9.tar.gz linux-5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9.tar.bz2 linux-5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9.zip |
Merge branch 'linus' into x86/urgent, to pick up dependent commit
We want to fix:
0e110732473e ("x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO")
So merge in Linus's latest into x86/urgent to have it available.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/reverse_cpuid.h')
-rw-r--r-- | arch/x86/kvm/reverse_cpuid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/reverse_cpuid.h b/arch/x86/kvm/reverse_cpuid.h index aadefcaa9561..58ac8d69c94b 100644 --- a/arch/x86/kvm/reverse_cpuid.h +++ b/arch/x86/kvm/reverse_cpuid.h @@ -102,10 +102,12 @@ static const struct cpuid_reg reverse_cpuid[] = { */ static __always_inline void reverse_cpuid_check(unsigned int x86_leaf) { + BUILD_BUG_ON(NR_CPUID_WORDS != NCAPINTS); BUILD_BUG_ON(x86_leaf == CPUID_LNX_1); BUILD_BUG_ON(x86_leaf == CPUID_LNX_2); BUILD_BUG_ON(x86_leaf == CPUID_LNX_3); BUILD_BUG_ON(x86_leaf == CPUID_LNX_4); + BUILD_BUG_ON(x86_leaf == CPUID_LNX_5); BUILD_BUG_ON(x86_leaf >= ARRAY_SIZE(reverse_cpuid)); BUILD_BUG_ON(reverse_cpuid[x86_leaf].function == 0); } |