From: Avi Kivity <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/kernel/external-module-compat.c b/kernel/external-module-compat.c
index 0b5fd41..28eabef 100644
--- a/kernel/external-module-compat.c
+++ b/kernel/external-module-compat.c
@@ -86,7 +86,7 @@ int kvm_smp_call_function_single(int cpu, void (*func)(void
*info),
#ifndef CONFIG_64BIT
/* 64bit divisor, dividend and result. dynamic precision */
-uint64_t div64_64(uint64_t dividend, uint64_t divisor)
+uint64_t div64_u64(uint64_t dividend, uint64_t divisor)
{
uint32_t high, d;
diff --git a/kernel/external-module-compat.h b/kernel/external-module-compat.h
index 5b9e2a4..27314eb 100644
--- a/kernel/external-module-compat.h
+++ b/kernel/external-module-compat.h
@@ -325,19 +325,21 @@ static inline void preempt_notifier_sys_exit(void) {}
#define HRTIMER_MODE_ABS HRTIMER_ABS
#endif
-/* div64_64 is fairly new */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
+/* div64_u64 is fairly new */
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,26)
+
+#define div64_u64 kvm_div64_u64
#ifdef CONFIG_64BIT
-static inline uint64_t div64_64(uint64_t dividend, uint64_t divisor)
+static inline uint64_t div64_u64(uint64_t dividend, uint64_t divisor)
{
return dividend / divisor;
}
#else
-uint64_t div64_64(uint64_t dividend, uint64_t divisor);
+uint64_t div64_u64(uint64_t dividend, uint64_t divisor);
#endif
diff --git a/kernel/include-compat/linux/math64.h
b/kernel/include-compat/linux/math64.h
new file mode 100644
index 0000000..dc7c581
--- /dev/null
+++ b/kernel/include-compat/linux/math64.h
@@ -0,0 +1,3 @@
+/*
+ * Empty file to satisfy #include <linux/math64.h> for older kernels.
+ */
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
