Add compatibility header file to make Linux 2.4.0 kernel patches cleaner.

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index b9a4dab..d6de193 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -61,6 +61,9 @@
 #include <linux/tqueue.h>
 #include <linux/poll.h>
 #endif
+#if LINUX_VERSION_CODE < 0x020400
+#include "compat-pre24.h"
+#endif
 #include "drm.h"
 
 #define DRM_DEBUG_CODE 2         /* Include debugging code (if > 1, then
@@ -140,11 +143,6 @@ typedef struct wait_queue *wait_queue_head_t;
 #define module_exit(x)  void cleanup_module(void) { x(); }
 #endif
 
-                               /* virt_to_page added in 2.4.0-test6 */
-#if LINUX_VERSION_CODE < 0x020400
-#define virt_to_page(kaddr) (mem_map + MAP_NR(kaddr))
-#endif
-
                                /* Generic cmpxchg added in 2.3.x */
 #ifndef __HAVE_ARCH_CMPXCHG
                                /* Include this here so that driver can be

diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c
index 5792bf3..14c7807 100644 (file)
--- a/linux-core/i810_dma.c
+++ b/linux-core/i810_dma.c
@@ -1227,7 +1227,6 @@ int i810_lock(struct inode *inode, struct file *filp, unsigned int cmd,
        }
        
        if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -1236,7 +1235,7 @@ int i810_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                if (lock.flags & _DRM_LOCK_QUIESCENT) {
                   DRM_DEBUG("_DRM_LOCK_QUIESCENT\n");
                   DRM_DEBUG("fred\n");

diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index 1816860..183e7fd 100644 (file)
--- a/linux-core/i810_drv.c
+++ b/linux-core/i810_drv.c
@@ -642,8 +642,6 @@ int i810_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
                                                       - dev->lck_start)]);
 #endif
        
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }

diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index a4a8fe5..f6a4a43 100644 (file)
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -655,8 +655,6 @@ int mga_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
           DRM_ERROR("\n");
        }
 
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }

diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index c4eb634..bb24b13 100644 (file)
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -656,7 +656,6 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 #endif
 
         if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -665,7 +664,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                 if (lock.flags & _DRM_LOCK_READY) {
                                /* Wait for space in DMA/FIFO */
                }
@@ -730,8 +729,6 @@ int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
        }
 #endif
 
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }

diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c
index 434a1cc..06ae798 100644 (file)
--- a/linux-core/sis_drv.c
+++ b/linux-core/sis_drv.c
@@ -626,7 +626,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 #endif
 
         if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -635,7 +634,7 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                 if (lock.flags & _DRM_LOCK_READY) {
                                /* Wait for space in DMA/FIFO */
                }
@@ -687,9 +686,7 @@ int sis_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
                }
        }
 
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }
 

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 7dfb20b..fb39374 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -54,7 +54,7 @@ PROGS=                drmstat
 
 DRMOBJS=       init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
                lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o
-DRMHEADERS=    drm.h drmP.h
+DRMHEADERS=    drm.h drmP.h compat-pre24.h
 
 GAMMAOBJS=      gamma_drv.o gamma_dma.o
 GAMMAHEADERS=   gamma_drv.h $(DRMHEADERS)

diff --git a/linux/drmP.h b/linux/drmP.h
index b9a4dab..d6de193 100644 (file)
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -61,6 +61,9 @@
 #include <linux/tqueue.h>
 #include <linux/poll.h>
 #endif
+#if LINUX_VERSION_CODE < 0x020400
+#include "compat-pre24.h"
+#endif
 #include "drm.h"
 
 #define DRM_DEBUG_CODE 2         /* Include debugging code (if > 1, then
@@ -140,11 +143,6 @@ typedef struct wait_queue *wait_queue_head_t;
 #define module_exit(x)  void cleanup_module(void) { x(); }
 #endif
 
-                               /* virt_to_page added in 2.4.0-test6 */
-#if LINUX_VERSION_CODE < 0x020400
-#define virt_to_page(kaddr) (mem_map + MAP_NR(kaddr))
-#endif
-
                                /* Generic cmpxchg added in 2.3.x */
 #ifndef __HAVE_ARCH_CMPXCHG
                                /* Include this here so that driver can be

diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c
index 4a2acfb..96ea045 100644 (file)
--- a/linux/gamma_dma.c
+++ b/linux/gamma_dma.c
@@ -804,7 +804,6 @@ int gamma_lock(struct inode *inode, struct file *filp, unsigned int cmd,
        drm_flush_unblock(dev, lock.context, lock.flags); /* cleanup phase */
        
        if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -813,7 +812,7 @@ int gamma_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                if (lock.flags & _DRM_LOCK_READY)
                        gamma_dma_ready(dev);
                if (lock.flags & _DRM_LOCK_QUIESCENT) {

diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c
index 1fcd193..4a353c6 100644 (file)
--- a/linux/gamma_drv.c
+++ b/linux/gamma_drv.c
@@ -564,8 +564,6 @@ int gamma_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
                                                       - dev->lck_start)]);
 #endif
        
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }

diff --git a/linux/i810_dma.c b/linux/i810_dma.c
index 5792bf3..14c7807 100644 (file)
--- a/linux/i810_dma.c
+++ b/linux/i810_dma.c
@@ -1227,7 +1227,6 @@ int i810_lock(struct inode *inode, struct file *filp, unsigned int cmd,
        }
        
        if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -1236,7 +1235,7 @@ int i810_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                if (lock.flags & _DRM_LOCK_QUIESCENT) {
                   DRM_DEBUG("_DRM_LOCK_QUIESCENT\n");
                   DRM_DEBUG("fred\n");

diff --git a/linux/i810_drv.c b/linux/i810_drv.c
index 1816860..183e7fd 100644 (file)
--- a/linux/i810_drv.c
+++ b/linux/i810_drv.c
@@ -642,8 +642,6 @@ int i810_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
                                                       - dev->lck_start)]);
 #endif
        
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }

diff --git a/linux/mga_dma.c b/linux/mga_dma.c
index d315954..bbfa949 100644 (file)
--- a/linux/mga_dma.c
+++ b/linux/mga_dma.c
@@ -1074,7 +1074,6 @@ int mga_lock(struct inode *inode, struct file *filp, unsigned int cmd,
        }
        
        if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -1083,7 +1082,7 @@ int mga_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                if (lock.flags & _DRM_LOCK_QUIESCENT) {
                   DRM_DEBUG("_DRM_LOCK_QUIESCENT\n");
                   mga_flush_queue(dev);

diff --git a/linux/mga_drv.c b/linux/mga_drv.c
index a4a8fe5..f6a4a43 100644 (file)
--- a/linux/mga_drv.c
+++ b/linux/mga_drv.c
@@ -655,8 +655,6 @@ int mga_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
           DRM_ERROR("\n");
        }
 
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }

diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index c4eb634..bb24b13 100644 (file)
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -656,7 +656,6 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 #endif
 
         if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -665,7 +664,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                 if (lock.flags & _DRM_LOCK_READY) {
                                /* Wait for space in DMA/FIFO */
                }
@@ -730,8 +729,6 @@ int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
        }
 #endif
 
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }

diff --git a/linux/sis_drv.c b/linux/sis_drv.c
index 434a1cc..06ae798 100644 (file)
--- a/linux/sis_drv.c
+++ b/linux/sis_drv.c
@@ -626,7 +626,6 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 #endif
 
         if (!ret) {
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
                sigemptyset(&dev->sigmask);
                sigaddset(&dev->sigmask, SIGSTOP);
                sigaddset(&dev->sigmask, SIGTSTP);
@@ -635,7 +634,7 @@ int sis_lock(struct inode *inode, struct file *filp, unsigned int cmd,
                dev->sigdata.context = lock.context;
                dev->sigdata.lock    = dev->lock.hw_lock;
                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
-#endif
+
                 if (lock.flags & _DRM_LOCK_READY) {
                                /* Wait for space in DMA/FIFO */
                }
@@ -687,9 +686,7 @@ int sis_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
                }
        }
 
-#if LINUX_VERSION_CODE >= 0x020400 /* KERNEL_VERSION(2,4,0) */
        unblock_all_signals();
-#endif
        return 0;
 }