diff mbox

Re: [cron job] v4l-dvb daily build 2.6.22 and up: ERRORS

Message ID loom.20090408T230421-516@post.gmane.org (mailing list archive)
State RFC
Headers show

Commit Message

Miroslav Å ustek April 8, 2009, 11:18 p.m. UTC 
Miroslav Å ustek <sustmidown <at> centrum.cz> writes:

> Marton Balint sent patch with <linux/div64.h> include and changed 'div_s64_rem'
> to 'div_s64'. But kernels older than 2.26.x have neither 'div_s64' nor
> 'div_s64_rem'.
> 
> Better apply this patch instead that from Marton.

Oh great, <linux/math64.h> (not div64.h like I have written before)
isn't in pre 2.6.26, too (yes I meant 2.6.26.x previously, not 2.26.x). :/

Including <asm/div64.h> works as well for me
and should work on older kernels, too.
Forget about the previous (..._math3) patch :)

- Mirek

----- FILE: cx88-dsp_64bit_math4.patch -----

cx88-dsp: again fixing 64bit math on 32bit kernels

From: Miroslav Sustek <sustmidown@centrum.cz>
Signed-off-by: Miroslav Sustek <sustmidown@centrum.cz>





--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff -r 77ebdc14cc24 linux/drivers/media/video/cx88/cx88-dsp.c
--- a/linux/drivers/media/video/cx88/cx88-dsp.c	Wed Apr 08 14:01:19 2009 -0300
+++ b/linux/drivers/media/video/cx88/cx88-dsp.c	Thu Apr 09 01:14:48 2009 +0200
@@ -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"
@@ -101,8 +102,8 @@ 
 	s32 coeff = 2*int_cos(freq);
 	u32 i;
 
-	s64 tmp;
-	u32 remainder;
+	u64 tmp;
+	u32 divisor;
 
 	for (i = 0; i < N; i++) {
 		s32 s = x[i] + ((s64)coeff*s_prev/32768) - s_prev2;
@@ -115,7 +116,10 @@ 
 
 	/* XXX: N must be low enough so that N*N fits in s32.
 	 * Else we need two divisions. */
-	return (u32) div_s64_rem(tmp, N*N, &remainder);
+	divisor = N*N;
+	do_div(tmp, divisor);
+
+	return (u32) tmp;
 }
 
 static u32 freq_magnitude(s16 x[], u32 N, u32 freq)