From c223f84d14b398495c4b229fcedd93c4d26873a2 Mon Sep 17 00:00:00 2001
From: Jerone Young <jyoung5@us.ibm.com>
Date: Mon, 19 Nov 2007 17:06:37 -0600
Subject: [PATCH] --- yaml --- r: 80757 b: refs/heads/master c:
 a162dd58736d446f52ca45b170508c3a5868807b h: refs/heads/master i:   80755:
 0317525e597e8e515f00221003e7f19625c45b5d v: v3

---
 [refs]                      |  2 +-
 trunk/include/asm-x86/kvm.h | 17 +++++++++++++++++
 trunk/include/linux/kvm.h   | 16 ----------------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 558c02330714..9c909c321012 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 244d57ece94b56692c61f2d507d1251b5844c550
+refs/heads/master: a162dd58736d446f52ca45b170508c3a5868807b
diff --git a/trunk/include/asm-x86/kvm.h b/trunk/include/asm-x86/kvm.h
index 32c7dda61474..4837d759bec0 100644
--- a/trunk/include/asm-x86/kvm.h
+++ b/trunk/include/asm-x86/kvm.h
@@ -135,4 +135,21 @@ struct kvm_msr_list {
 };
 
 
+struct kvm_cpuid_entry {
+	__u32 function;
+	__u32 eax;
+	__u32 ebx;
+	__u32 ecx;
+	__u32 edx;
+	__u32 padding;
+};
+
+/* for KVM_SET_CPUID */
+struct kvm_cpuid {
+	__u32 nent;
+	__u32 padding;
+	struct kvm_cpuid_entry entries[0];
+};
+
+
 #endif
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
index e6867aa6daf6..fd4f900fcce3 100644
--- a/trunk/include/linux/kvm.h
+++ b/trunk/include/linux/kvm.h
@@ -192,22 +192,6 @@ struct kvm_dirty_log {
 	};
 };
 
-struct kvm_cpuid_entry {
-	__u32 function;
-	__u32 eax;
-	__u32 ebx;
-	__u32 ecx;
-	__u32 edx;
-	__u32 padding;
-};
-
-/* for KVM_SET_CPUID */
-struct kvm_cpuid {
-	__u32 nent;
-	__u32 padding;
-	struct kvm_cpuid_entry entries[0];
-};
-
 /* for KVM_SET_SIGNAL_MASK */
 struct kvm_signal_mask {
 	__u32 len;