[PATCH] kvm-kmod: Fix condition for native_read_msr_safe wrapping

Jan Kiszka
2009-06-25T08:24:28Z

For i386, native_read_msr_safe was already introduced in 2.6.22.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

x86/external-module-compat.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h
index 881602e..8436e43 100644
--- a/x86/external-module-compat.h
+++ b/x86/external-module-compat.h
@@ -72,6 +72,8 @@ typedef u64 phys_addr_t;
#define _ASM_ALIGN __ASM_SEL(.balign 4, .balign 8)
#endif

+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) || defined(CONFIG_X86_64)
+
static inline unsigned long long native_read_msr_safe(unsigned int msr,
int *err)
{
@@ -90,6 +92,8 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr,

#endif

+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)

static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)