Changeset 86547 in vbox

Timestamp:

Oct 12, 2020 6:57:00 PM (4 years ago)

Author:

vboxsync

Message:

linux/drm.c,the-linux-kernel.h: nits. bugref:4567

Location:

trunk/src/VBox

Files:

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

-              r86542
+              r86547
 static int
 #endif
             vbox_master_set(struct drm_device *dev,
                            struct drm_file *file_priv, bool from_open)
+vbox_master_set(struct drm_device *dev,
+                struct drm_file *file_priv, bool from_open)
+{
         struct vbox_private *vbox = dev->dev_private;

-              r86542
+              r86547
 #include <linux/completion.h>
 #include <linux/compiler.h>
+/* linux/fs.h defines HAVE_UNLOCKED_IOCTL from 2.6.11 till 5.9, but its meaning remains valid */
+#if RTLNX_VER_MIN(5,9,0)
+# define HAVE_UNLOCKED_IOCTL 1
+#if RTLNX_VER_MIN(5,9,0) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9, when it became an implicit assumption. */
+# define HAVE_UNLOCKED_IOCTL 1 /* We use this in a couple of places, so for now just define it for 5.9+ too. */
 #endif
 #if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)

Note: See TracChangeset for help on using the changeset viewer.