Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 340e01248478ba8b78a6d4d1809b1eff > files > 22

kvm-83-270.el5_11.src.rpm

From 956ed005e9ccf47ae032e29bc6a192cea2b0fba7 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 15 Jan 2009 17:40:28 -0200
Subject: [PATCH 17/54] 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)
---
 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