1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 60e5497681f5..813d29d00a17 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -525,6 +525,13 @@ static void early_init_amd(struct cpuinfo_x86 *c)
         }
 #endif
 
+        /*
+         * This is only needed to tell the kernel whether to use VMCALL
+         * and VMMCALL.  VMMCALL is never executed except under virt, so
+         * we can set it unconditionally.
+         */
+        set_cpu_cap(c, X86_FEATURE_VMMCALL);
+
         /* F16h erratum 793, CVE-2013-6885 */
         if (c->x86 == 0x16 && c->x86_model <= 0xf)
                 msr_set_bit(MSR_AMD64_LS_CFG, 15);