[maint/2.6.29 PATCH] kvm-userspace: include <asm/svm.h> on external-module-compat.h

[Eduardo Habkost <ehabkost@redhat.com>]

Make sure we get the MSR_* defines from asm/svm.h before checking
if they are defined.

This fixes the following warning:

 In file included from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/kvm_svm.h:10,
                  from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/svm.c:58:
 /home/ehabkost/code/kvm/kvm-userspace/kernel/include/asm/svm.h:219:1: warning: "MSR_VM_HSAVE_PA" redefined


This fix applies only to the maint/2.6.29 branch, as on the master
branch the MSR_* defines went to a different header file.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 kernel/x86/external-module-compat.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/kernel/x86/external-module-compat.h b/kernel/x86/external-module-compat.h
index 04352bc..9ba1cc8 100644
--- a/kernel/x86/external-module-compat.h
+++ b/kernel/x86/external-module-compat.h
@@ -10,6 +10,9 @@
 
 #include <asm/msr.h>
 
+/* for the MSR_VM_* constants that were moved to svm.h */
+#include <asm/svm.h>
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 
 #ifndef _EFER_SCE
-- 
1.6.1