From 8de2958950af658fcef51be12b1abcb0024fa965 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Mon, 17 Nov 2008 19:03:13 -0200
Subject: [PATCH] --- yaml --- r: 125229 b: refs/heads/master c:
 13673a90f1cf88296f726265cc7cf3ec76ecba30 h: refs/heads/master i:   125227:
 f04b1306892f7a1ef767e7f1a08d2b3ec11f2578 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/x86/{kvm => include/asm}/vmx.h | 0
 trunk/arch/x86/kvm/mmu.c                  | 2 +-
 trunk/arch/x86/kvm/vmx.c                  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename trunk/arch/x86/{kvm => include/asm}/vmx.h (100%)

diff --git a/[refs] b/[refs]
index c9400855c539..70f752cd9a43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe4e771d5c37f0949047faf95d16a512b21406bf
+refs/heads/master: 13673a90f1cf88296f726265cc7cf3ec76ecba30
diff --git a/trunk/arch/x86/kvm/vmx.h b/trunk/arch/x86/include/asm/vmx.h
similarity index 100%
rename from trunk/arch/x86/kvm/vmx.h
rename to trunk/arch/x86/include/asm/vmx.h
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index 8904e8ada978..fa3486d64078 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include "vmx.h"
 #include "mmu.h"
 
 #include <linux/kvm_host.h>
@@ -33,6 +32,7 @@
 #include <asm/page.h>
 #include <asm/cmpxchg.h>
 #include <asm/io.h>
+#include <asm/vmx.h>
 
 /*
  * When setting this variable to true it enables Two-Dimensional-Paging
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 427dbc14fae9..ec71f6464cfa 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -16,7 +16,6 @@
  */
 
 #include "irq.h"
-#include "vmx.h"
 #include "mmu.h"
 
 #include <linux/kvm_host.h>
@@ -31,6 +30,7 @@
 
 #include <asm/io.h>
 #include <asm/desc.h>
+#include <asm/vmx.h>
 
 #define __ex(x) __kvm_handle_fault_on_reboot(x)