Changeset 39830 in vbox

Timestamp:

Jan 22, 2012 1:05:07 PM (13 years ago)

Author:

vboxsync

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

75834

Message:

additions/linux: compilation with linux-3.3.0-rc1 (untested, please review).

File:

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

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

@@ -86 +86 @@
 #endif
 }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
+/* since linux-3.3.0-rc1 drm_driver::fops is pointer */
+static struct file_operations driver_fops =
+{
+        .owner = THIS_MODULE,
+        .open = drm_open,
+        .release = drm_release,
+        .unlocked_ioctl = drm_ioctl,
+        .mmap = drm_mmap,
+        .poll = drm_poll,
+        .fasync = drm_fasync,
+};
+#endif
 
 static struct drm_driver driver =
@@ -97 +110 @@
     .get_reg_ofs = drm_core_get_reg_ofs,
 #endif
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
     .fops =
     {
@@ -113 +127 @@
         .fasync = drm_fasync,
     },
+#else /* LINUX_VERSION_CODE > KERNEL_VERSION(3,3,0) */
+    .fops = NULL,
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
     .pci_driver =