---

yaml --- r: 258042 b: refs/heads/master c: a01c8f9 h: refs/heads/master v: v3
git-mirror · Jul 12, 2011 · c13f006 · c13f006
1 parent e0fb93d
commit c13f006
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 176f61da82435eae09cc96f70b530d1ba0746b8b
+refs/heads/master: a01c8f9b4e266df1d7166d23216f2060648f862d
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -2372,7 +2372,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
 
 	/* cpuid 7.0.ebx */
 	const u32 kvm_supported_word9_x86_features =
-		F(SMEP) | F(FSGSBASE);
+		F(SMEP) | F(FSGSBASE) | F(ERMS);
 
 	/* all calls to cpuid_count() should be made on the same cpu */
 	get_cpu();