The static-call conversion removed the alternative instruction templates that used X86_FEATURE_VMCALL and X86_FEATURE_VMW_VMMCALL. Their remaining users only force the bits during VMware setup; no code tests either bit.
Remove the forced capabilities and mark both positions free in the kernel header. Neither feature has a cpuinfo name, so this changes no userspace-visible flag. Signed-off-by: Zack Rusin <[email protected]> --- arch/x86/include/asm/cpufeatures.h | 4 ++-- arch/x86/kernel/cpu/vmware.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 61930f0d4578..b7633930020f 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -233,8 +233,8 @@ #define X86_FEATURE_VMMCALL ( 8*32+15) /* "vmmcall" Prefer VMMCALL to VMCALL */ #define X86_FEATURE_XENPV ( 8*32+16) /* Xen paravirtual guest */ #define X86_FEATURE_EPT_AD ( 8*32+17) /* "ept_ad" Intel Extended Page Table access-dirty bit */ -#define X86_FEATURE_VMCALL ( 8*32+18) /* Hypervisor supports the VMCALL instruction */ -#define X86_FEATURE_VMW_VMMCALL ( 8*32+19) /* VMware prefers VMMCALL hypercall instruction */ +// free: was #define X86_FEATURE_VMCALL ( 8*32+18) /* Hypervisor supports VMCALL */ +// free: was #define X86_FEATURE_VMW_VMMCALL ( 8*32+19) /* VMware prefers VMMCALL */ // free: was #define X86_FEATURE_PVUNLOCK ( 8*32+20) /* PV unlock function */ #define X86_FEATURE_VCPUPREEMPT ( 8*32+21) /* PV vcpu_is_preempted function */ #define X86_FEATURE_TDX_GUEST ( 8*32+22) /* "tdx_guest" Intel Trust Domain Extensions Guest */ diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 6719c009f237..b5c1610ff408 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -492,10 +492,6 @@ static void __init vmware_set_capabilities(void) setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE); if (vmware_tsc_khz) setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ); - if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMCALL) - setup_force_cpu_cap(X86_FEATURE_VMCALL); - else if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMMCALL) - setup_force_cpu_cap(X86_FEATURE_VMW_VMMCALL); } static unsigned long
