Re: [Dri-devel] [PATCH again] Make mach64.o kernel module work with2.5

[Colin Leroy]

On 01 Jul 2003 at 03h33, Colin Leroy wrote:

Hi,

> Ok, i'll fix these and send a second patch as soon as anoncvs will have
> caught up. Thanks for pointing this!

I felt I would forget if i waited for CVS :) so here's another patch (made
with diff -u instead of cvs diff -u).
It should apply cleanly to developer's CVS if Jose didn't rework the first
one :) 
-- 
Colin
panic("Reboot failed -- System halted\n");
    2.2.19 linux/arch/arm/kernel/process.c

--- linux/drm/kernel/drmP.h.orig        Tue Jul  1 03:35:55 2003
+++ linux/drm/kernel/drmP.h     Tue Jul  1 03:36:14 2003
@@ -801,7 +801,7 @@
                                   unsigned int cmd, unsigned long arg );
 extern int           DRM(irq_install)( drm_device_t *dev, int irq );
 extern int           DRM(irq_uninstall)( drm_device_t *dev );
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,1)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,70)
 extern void   DRM(dma_service)( int irq, void *device,
                                       struct pt_regs *regs );
 #else
--- shared/drm/kernel/mach64_irq.c.orig Tue Jul  1 03:36:41 2003
+++ shared/drm/kernel/mach64_irq.c      Tue Jul  1 03:37:43 2003
@@ -40,7 +40,7 @@
 #include "mach64_drm.h"
 #include "mach64_drv.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,1)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,70)
 void DRM(dma_service)( DRM_IRQ_ARGS )
 #else
 irqreturn_t DRM(dma_service)( DRM_IRQ_ARGS )
@@ -68,11 +68,12 @@
            atomic_inc(&dev->vbl_received);
            DRM_WAKEUP(&dev->vbl_queue);
            DRM(vbl_send_signals)( dev );
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,69)
+           return IRQ_HANDLED;
+#endif
        }
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,1)
-       return;
-#else
-       return IRQ_HANDLED;
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,69)
+       return IRQ_NONE;
 #endif
 }