[linux-dvb] Recent vanilla kernel changes not in cvs?

["C.Y.M" <syphir@syphir.sytes.net>]

Hello,

I was doing some comparisons of recent kernel snapshot patches today and 
it appears that there was a change made to the vanilla kernel sources 
that was not introduced into the cvs of the dvb-kernel.  Does this 
following change also need to be added to the dvb-kernel?

--- a/drivers/media/dvb/ttpci/av7110_hw.c       2004-10-25 05:14:44 -07:00
+++ b/drivers/media/dvb/ttpci/av7110_hw.c       2004-11-21 02:51:13 -08:00
@@ -952,11 +952,11 @@
        case OSD_SetPalette:
        {
                if (FW_VERSION(av7110->arm_app) >= 0x2618) {
-                       ret = OSDSetPalette(av7110, (u32 *)dc->data, 
dc->color, dc->x0);
+                       ret = OSDSetPalette(av7110, dc->data, dc->color, 
dc->x0);
                        goto out;
                } else {
                        int i, len = dc->x0-dc->color+1;
-                       u8 *colors = (u8 *)dc->data;
+                       u8 __user *colors = dc->data;
                        u8 r, g, b, blend;

                        for (i = 0; i<len; i++) {


There were also a few frontend changes to stv0299.c but I am assuming 
that they do not apply since the "refactored" branch has not yet been 
introduced to the vanilla kernel sources.

Finally, the last relevant changes (which are not part of the cvs 
dvb-kernel) but may affect its behavior are the following. I do not know 
how this may affect the current cvs dvb-kernel drivers but I just wanted 
to give a "heads up" on the changes.

diff -Nru a/drivers/media/video/saa7146.h b/drivers/media/video/saa7146.h
--- a/drivers/media/video/saa7146.h     2004-01-08 13:35:02 -08:00
+++ b/drivers/media/video/saa7146.h     2004-11-19 05:52:58 -08:00
@@ -78,7 +78,7 @@
        unsigned char boardcfg[64];     /* 64 bytes of config from 
eeprom */
        unsigned long saa7146_adr;   /* bus address of IO mem from PCI 
BIOS */
        struct saa7146_window win;
-       unsigned char *saa7146_mem; /* pointer to mapped IO memory */
+       unsigned char __iomem *saa7146_mem; /* pointer to mapped IO 
memory */
        struct device_open open_data[MAX_OPENS];
 #define MAX_MARKS 16
        /* for a/v sync */
@@ -95,10 +95,10 @@
 #endif

 #ifdef _ALPHA_SAA7146
-#define saawrite(dat,adr)    writel((dat),(char *) 
(saa->saa7146_adr+(adr)))
+#define saawrite(dat,adr)    writel((dat), saa->saa7146_adr+(adr))
 #define saaread(adr)         readl(saa->saa7146_adr+(adr))
 #else
-#define saawrite(dat,adr)    writel((dat), (char *) 
(saa->saa7146_mem+(adr)))
+#define saawrite(dat,adr)    writel((dat), saa->saa7146_mem+(adr))
 #define saaread(adr)         readl(saa->saa7146_mem+(adr))
 #endif

diff -Nru a/include/media/saa7146.h b/include/media/saa7146.h
--- a/include/media/saa7146.h   2004-10-20 01:36:59 -07:00
+++ b/include/media/saa7146.h   2004-11-19 05:52:59 -08:00
@@ -123,7 +123,7 @@
                spinlock_t                      slock;
         struct semaphore               lock;

-       unsigned char                   *mem;           /* pointer to 
mapped IO memory */
+       unsigned char                   __iomem *mem;   /* pointer to 
mapped IO memory */
        int                             revision;       /* chip 
revision; needed for bug-workarounds*/

        /* pci-device & irq stuff*/