x86: kvm: use alternatives for VMCALL vs. VMMCALL if kernel text is read-only

[pandora-kernel.git] / arch / x86 / kernel / cpu / amd.c

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index f07becc..2d44a28 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -469,6 +469,13 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
                        set_cpu_cap(c, X86_FEATURE_EXTD_APICID);
        }
 #endif
                        set_cpu_cap(c, X86_FEATURE_EXTD_APICID);
        }
 #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);

 }
 
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 }
 
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)