---

yaml --- r: 197837 b: refs/heads/master c: 0e6ac58 h: refs/heads/master i: 197835: 9cacdce v: v3
git-mirror · May 19, 2010 · a46dd0c · a46dd0c
1 parent fa24529
commit a46dd0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11c6bffa42b85e703c21a1d2372dce7262daca8e
+refs/heads/master: 0e6ac58acbcddbc9d1687214f0d43d8657cc036c
diff --git a/trunk/arch/x86/include/asm/kvm_para.h b/trunk/arch/x86/include/asm/kvm_para.h
@@ -16,6 +16,10 @@
 #define KVM_FEATURE_CLOCKSOURCE		0
 #define KVM_FEATURE_NOP_IO_DELAY	1
 #define KVM_FEATURE_MMU_OP		2
+/* This indicates that the new set of kvmclock msrs
+ * are available. The use of 0x11 and 0x12 is deprecated
+ */
+#define KVM_FEATURE_CLOCKSOURCE2        3
 
 #define MSR_KVM_WALL_CLOCK  0x11
 #define MSR_KVM_SYSTEM_TIME 0x12