kvm: external module: move compat div64_64 to .c file

Signed-off-by: Avi Kivity <avi@qumranet.com>

2 files changed, 30 insertions, 18 deletions

diff --git a/kernel/external-module-compat.c b/kernel/external-module-compat.c
index 7b0b9833..1eca5fc0 100644
--- a/kernel/external-module-compat.c
+++ b/kernel/external-module-compat.c
@@ -77,3 +77,32 @@ int kvm_smp_call_function_single(int cpu, void (*func)(void *info),
 #define smp_call_function_single kvm_smp_call_function_single
 
 #endif
+
+/* div64_64 is fairly new */
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
+
+#ifndef CONFIG_64BIT
+
+/* 64bit divisor, dividend and result. dynamic precision */
+uint64_t div64_64(uint64_t dividend, uint64_t divisor)
+{
+	uint32_t high, d;
+
+	high = divisor >> 32;
+	if (high) {
+		unsigned int shift = fls(high);
+
+		d = divisor >> shift;
+		dividend >>= shift;
+	} else
+		d = divisor;
+
+	do_div(dividend, d);
+
+	return dividend;
+}
+
+#endif
+
+#endif
+
diff --git a/kernel/external-module-compat.h b/kernel/external-module-compat.h
index acc7a036..8723ae3d 100644
--- a/kernel/external-module-compat.h
+++ b/kernel/external-module-compat.h
@@ -332,24 +332,7 @@ static inline uint64_t div64_64(uint64_t dividend, uint64_t divisor)
 
 #else
 
-/* 64bit divisor, dividend and result. dynamic precision */
-static inline uint64_t div64_64(uint64_t dividend, uint64_t divisor)
-{
-	uint32_t high, d;
-
-	high = divisor >> 32;
-	if (high) {
-		unsigned int shift = fls(high);
-
-		d = divisor >> shift;
-		dividend >>= shift;
-	} else
-		d = divisor;
-
-	do_div(dividend, d);
-
-	return dividend;
-}
+uint64_t div64_64(uint64_t dividend, uint64_t divisor);
 
 #endif