Changeset 74615 in vbox for trunk/src/VBox/Additions/linux/drm/vbox_drv.h

Timestamp:

Oct 4, 2018 3:44:01 PM (6 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxvideo: fix building on various EL 7 minor releases.
bugref:4567: Linux kernel driver maintenance

File:

• trunk/src/VBox/Additions/linux/drm/vbox_drv.h (modified) (5 diffs)

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

@@ -59 +59 @@
 #  define RHEL_73
 # endif
+# if RHEL_MAJOR == 7 && RHEL_MINOR >= 2
+#  define RHEL_72
+# endif
 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 1
 #  define RHEL_71
+# endif
+# if RHEL_MAJOR == 7 && RHEL_MINOR >= 0
+#  define RHEL_70
 # endif
 #endif
@@ -80 +86 @@
 
 #include <drm/drmP.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
 #include <drm/drm_gem.h>
 #endif
@@ -262 +268 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && !defined(RHEL_73)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && !defined(RHEL_71)
 #define CRTC_FB(crtc) ((crtc)->fb)
 #else
@@ -293 +299 @@
         struct ttm_bo_kmap_obj kmap;
         struct drm_gem_object gem;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_73)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
         u32 placements[3];
 #else
@@ -368 +374 @@
 struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj);
 struct drm_gem_object *vbox_gem_prime_import_sg_table(struct drm_device *dev,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_73)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
                                                       size_t size,
 #else