kmod: Adjust MSR helper availability

PATCH New Jan Kiszka 1 participant 1 message May 11, 2009 KVM

lore

Share & tools

lore

Jan Kiszka

author

2009-05-11 15:36 UTC #0 lore raw

PATCH 1/1 kmod: Adjust MSR helper availability

native_read_msr_safe() and macros already materialized in 2.6.25, only rdmsrl_safe is required for that kernel.

Signed-off-by Jan Kiszka <[email protected]>

---

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

x86/external-module-compat.h +5 -1

index 13a218b..a9476ff 100644
@@ -11,7 +11,7 @@
 #include <asm/msr.h>
 #include <asm/asm.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 
 #ifdef CONFIG_X86_64
 #define DECLARE_ARGS(val, low, high)	unsigned low, high

@@ -73,6 +73,10 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr,
 	return EAX_EDX_VAL(val, low, high);
 }
 
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+
 static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
 {
 	int err;