summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2009-01-15 17:40:28 -0200
committerEduardo Habkost <ehabkost@redhat.com>2009-02-06 10:47:37 -0200
commit956ed005e9ccf47ae032e29bc6a192cea2b0fba7 (patch)
treecc72f7f3ba884e6b2db4ed64241b005d36e86f40 /kernel
parente307220de5ee5b73353848454c5e1c9f15e6d660 (diff)
include <asm/svm.h> on external-module-compat.h
Make sure we get the MSR_* defines from there if needed. This fixes some "already defined" warnings when compiling. 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> RH-Type: bugfix(build) RH-Upstream-status: not_applicable(kvm/master), submitted(maint/2.6.29)
Diffstat (limited to 'kernel')
-rw-r--r--kernel/x86/external-module-compat.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/x86/external-module-compat.h b/kernel/x86/external-module-compat.h
index 04352bc6..9ba1cc84 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