compat: badly hack a div64 fix for 2.6.24

d12c4247 · Alessandro Rubini · fbf2007c · d12c4247 · d12c4247 · d12c4247
Commit d12c4247 authored Jun 22, 2012 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

acam.c acam.c +1 -1

calibrate.c calibrate.c +1 -1

fine-delay.h fine-delay.h +10 -0

No files found.
--- a/acam.c
+++ b/acam.c
@@ -14,7 +14,7 @@
 #include <linux/jiffies.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <linux/math64.h>
+//#include <linux/math64.h>
 #include <linux/moduleparam.h>
 #include "fine-delay.h"
 #include "hw/fd_main_regs.h"

--- a/calibrate.c
+++ b/calibrate.c
@@ -15,7 +15,7 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <linux/math64.h>
+//#include <linux/math64.h>
 #include "fine-delay.h"
 #include "hw/fd_main_regs.h"
 #include "hw/acam_gpx.h"

--- a/fine-delay.h
+++ b/fine-delay.h
@@ -99,7 +99,17 @@ enum fd_output_mode {
 #ifdef __KERNEL__ /* All the rest is only of kernel users */
 #include <linux/spinlock.h>
 #include <linux/timer.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
 #include <linux/math64.h>
+#else
+/* Hack to compile under 2.6.24: this comes from 2418f4f2 (Roman Zippel) */
+static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
+{
+	*remainder = do_div(dividend, divisor);
+	return dividend;
+}
+#endif
 struct fd_calib {
 	int64_t frr_poly[3];		/* SY89295 delay/temp poly coeffs */