The patch titled
cx88-dsp: fixing 64bit math on 32bit kernels
has been added to the -mm tree. Its filename is
cx88-dsp-fixing-64bit-math-on-32bit-kernels.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cx88-dsp: fixing 64bit math on 32bit kernels
From: Miroslav Sustek <sustmidown@xxxxxxxxxx>
Some gcc versions report the missing of __divdi3
[mchehab.redhat.com: CodingStyle fixes]
Signed-off-by: Miroslav Sustek <sustmidown@xxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/media/video/cx88/cx88-dsp.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff -puN drivers/media/video/cx88/cx88-dsp.c~cx88-dsp-fixing-64bit-math-on-32bit-kernels drivers/media/video/cx88/cx88-dsp.c
--- a/drivers/media/video/cx88/cx88-dsp.c~cx88-dsp-fixing-64bit-math-on-32bit-kernels
+++ a/drivers/media/video/cx88/cx88-dsp.c
@@ -22,6 +22,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/jiffies.h>
+#include <asm/div64.h>
#include "cx88.h"
#include "cx88-reg.h"
@@ -100,13 +101,25 @@ static u32 int_goertzel(s16 x[], u32 N,
s32 s_prev2 = 0;
s32 coeff = 2*int_cos(freq);
u32 i;
+
+ u64 tmp;
+ u32 divisor;
+
for (i = 0; i < N; i++) {
s32 s = x[i] + ((s64)coeff*s_prev/32768) - s_prev2;
s_prev2 = s_prev;
s_prev = s;
}
- return (u32)(((s64)s_prev2*s_prev2 + (s64)s_prev*s_prev -
- (s64)coeff*s_prev2*s_prev/32768)/N/N);
+
+ tmp = (s64)s_prev2 * s_prev2 + (s64)s_prev * s_prev -
+ (s64)coeff * s_prev2 * s_prev / 32768;
+
+ /* XXX: N must be low enough so that N*N fits in s32.
+ * Else we need two divisions. */
+ divisor = N * N;
+ do_div(tmp, divisor);
+
+ return (u32) tmp;
}
static u32 freq_magnitude(s16 x[], u32 N, u32 freq)
_
Patches currently in -mm which might be from sustmidown@xxxxxxxxxx are
cx88-dsp-fixing-64bit-math-on-32bit-kernels.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
