OSDN Git Service

drm: drop Linux < 2.6.10 support
authorPekka Paalanen <pq@iki.fi>
Sun, 1 Mar 2009 22:17:44 +0000 (00:17 +0200)
committerPekka Paalanen <pq@iki.fi>
Sun, 1 Mar 2009 22:21:09 +0000 (00:21 +0200)
Signed-off-by: Pekka Paalanen <pq@iki.fi>
linux-core/drm_compat.h
linux-core/mga_drv.c
linux-core/nouveau_drv.c
linux-core/r128_drv.c
linux-core/radeon_drv.c
linux-core/xgi_drv.c

index a567356..937908a 100644 (file)
 #define IRQF_SHARED SA_SHIRQ
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-static inline int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t pgprot)
-{
-  return remap_page_range(vma, from,
-                         pfn << PAGE_SHIFT,
-                         size,
-                         pgprot);
-}
-
-static __inline__ void *kcalloc(size_t nmemb, size_t size, int flags)
-{
-       void *addr;
-
-       addr = kmalloc(size * nmemb, flags);
-       if (addr != NULL)
-               memset((void *)addr, 0, size * nmemb);
-
-       return addr;
-}
-#endif
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 #define mutex_lock down
 #define mutex_unlock up
index 14a0be4..ce49857 100644 (file)
@@ -73,7 +73,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+#if defined(CONFIG_COMPAT)
                .compat_ioctl = mga_compat_ioctl,
 #endif
                },
index c8f57df..b31485a 100644 (file)
@@ -70,7 +70,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+#if defined(CONFIG_COMPAT)
                .compat_ioctl = nouveau_compat_ioctl,
 #endif
        },
index 7b6159b..111fe71 100644 (file)
@@ -68,7 +68,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+#if defined(CONFIG_COMPAT)
                .compat_ioctl = r128_compat_ioctl,
 #endif
                },
index 934fa0b..902bdc2 100644 (file)
@@ -114,7 +114,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+#if defined(CONFIG_COMPAT)
                .compat_ioctl = radeon_compat_ioctl,
 #endif
                },
index bfe9acd..51ace0f 100644 (file)
@@ -93,7 +93,7 @@ static struct drm_driver driver = {
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
-#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+#if defined(CONFIG_COMPAT)
                .compat_ioctl = xgi_compat_ioctl,
 #endif
        },