The patch number 12113 was added via Trent Piepho <xy...@speakeasy.org>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        Linux Media Mailing List <linux-me...@vger.kernel.org>

------

From: Trent Piepho  <xy...@speakeasy.org>
compat: Fix __fls for certain ARM kernels


__fls() has a broken definition for ARM in from v2.6.26-7260-g0c65f45 to
v2.6.28-rc6-187-g94fc733.  We can fix this by just undef'ing __fls before
the compat define.  This will let us replace the broken one with our
working one.  For those kernels where the compat code is triggered and
__fls works, we replace the working one with our (identical) working
version, which is not a problem.

Priority: normal

Signed-off-by: Trent Piepho <xy...@speakeasy.org>


---

 v4l/compat.h |    1 +
 1 file changed, 1 insertion(+)

diff -r 2899ad868fc6 -r 518b7754cd3d v4l/compat.h
--- a/v4l/compat.h      Thu Jun 18 19:31:36 2009 +0200
+++ b/v4l/compat.h      Sat Jun 20 09:42:15 2009 -0700
@@ -462,6 +462,7 @@ static inline int snd_card_create(int id
        defined(__x86_64__) || \
        (BITS_PER_LONG == 64 && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)))
 /* This define will prevent breakage if __fls was already defined. */
+#undef __fls
 #define __fls v4l_compat_fls
 static inline unsigned long v4l_compat_fls(unsigned long x)
 {


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/518b7754cd3d4a8f4757e2c25db3c42dd406161e

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to