Changeset 42164 in vbox

Timestamp:

Jul 16, 2012 12:55:41 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79143

Message:

Additions/linux/drm: make the kernel module work with CentOS 6.3 and friends.

File:

• trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c (modified) (4 diffs)

trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c

@@ -68 +68 @@
 #    define DRM_RHEL61
 #   endif
+#   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,3)
+#    define DRM_RHEL63
+#   endif
 #  endif
 # endif
@@ -86 +89 @@
 #endif
 }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_RHEL63)
 /* since linux-3.3.0-rc1 drm_driver::fops is pointer */
 static struct file_operations driver_fops =
@@ -110 +113 @@
     .get_reg_ofs = drm_core_get_reg_ofs,
 #endif
-# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) && !defined(DRM_RHEL63)
     .fops =
     {
@@ -127 +130 @@
         .fasync = drm_fasync,
     },
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_RHEL63) */
     .fops = &driver_fops,
 #endif