From 0317525e597e8e515f00221003e7f19625c45b5d Mon Sep 17 00:00:00 2001
From: Jerone Young <jyoung5@us.ibm.com>
Date: Mon, 19 Nov 2007 17:06:35 -0600
Subject: [PATCH] --- yaml --- r: 80755 b: refs/heads/master c:
 3a56b20104f51bd6caf07e49fa1e3c09bee222e5 h: refs/heads/master i:   80753:
 fb69178fa587e9839b3c3f90c95c97cbdffc8e9a   80751:
 77b0903c8bcee45004aecfde2b87d85aed001270 v: v3

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

diff --git a/[refs] b/[refs]
index 89b3cb1a9c3f..6a9258bb4e4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9ecf9281069c4c8dd429e1eb61cb7e0f3dda6b4
+refs/heads/master: 3a56b20104f51bd6caf07e49fa1e3c09bee222e5
diff --git a/trunk/include/asm-x86/kvm.h b/trunk/include/asm-x86/kvm.h
index a2c65b5c4a85..644a325077f0 100644
--- a/trunk/include/asm-x86/kvm.h
+++ b/trunk/include/asm-x86/kvm.h
@@ -82,4 +82,21 @@ struct kvm_lapic_state {
 	char regs[KVM_APIC_REG_SIZE];
 };
 
+struct kvm_segment {
+	__u64 base;
+	__u32 limit;
+	__u16 selector;
+	__u8  type;
+	__u8  present, dpl, db, s, l, g, avl;
+	__u8  unusable;
+	__u8  padding;
+};
+
+struct kvm_dtable {
+	__u64 base;
+	__u16 limit;
+	__u16 padding[3];
+};
+
+
 #endif
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
index 280ec0d85b4c..442cb58bb73c 100644
--- a/trunk/include/linux/kvm.h
+++ b/trunk/include/linux/kvm.h
@@ -151,21 +151,6 @@ struct kvm_fpu {
 };
 
 
-struct kvm_segment {
-	__u64 base;
-	__u32 limit;
-	__u16 selector;
-	__u8  type;
-	__u8  present, dpl, db, s, l, g, avl;
-	__u8  unusable;
-	__u8  padding;
-};
-
-struct kvm_dtable {
-	__u64 base;
-	__u16 limit;
-	__u16 padding[3];
-};
 
 /* for KVM_GET_SREGS and KVM_SET_SREGS */
 struct kvm_sregs {