---

yaml --- r: 197634 b: refs/heads/master c: 8249402 h: refs/heads/master v: v3
git-mirror · Apr 25, 2010 · 962b8d9 · 962b8d9
1 parent b56839f
commit 962b8d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a810181c8bcd73112f5c62b205b5583fd4a197f
+refs/heads/master: 82494028dff648c29e3a40915f1fceca51b4490a
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -1090,6 +1090,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 		break;
 	case MSR_K7_HWCR:
 		data &= ~(u64)0x40;	/* ignore flush filter disable */
+		data &= ~(u64)0x100;	/* ignore ignne emulation enable */
 		if (data != 0) {
 			pr_unimpl(vcpu, "unimplemented HWCR wrmsr: 0x%llx\n",
 				data);