Changeset 85649 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 8, 2020 1:35:48 PM (4 years ago)

Author:

vboxsync

Message:

ticketref:19521 Can't build kernel modules on SLES12 SP5

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (1 diff)
• vbox_drv.h (modified) (1 diff)
• vbox_main.c (modified) (1 diff)
• vbox_mode.c (modified) (2 diffs)
• vbox_ttm.c (modified) (11 diffs)

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

@@ -327 +327 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
 # if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         .set_busid = drm_pci_set_busid,
 # endif

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

@@ -90 +90 @@
 # if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
 #  define OPENSUSE_151
+# endif
+# if CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 5
+#  define OPENSUSE_125
 # endif
 #endif

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

@@ -606 +606 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151) && !defined(RHEL_77) && !defined(RHEL_81)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151) && !defined(OPENSUSE_125) \
+  && !defined(RHEL_77) && !defined(RHEL_81)
 static void ttm_bo_put(struct ttm_buffer_object *bo)
 {

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

@@ -548 +548 @@
                 sum += edid[i];
         edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(RHEL_77) || defined(RHEL_81)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
+  || defined(RHEL_77) || defined(RHEL_81)
         drm_connector_update_edid_property(connector, (struct edid *)edid);
 #else
@@ -723 +724 @@
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(RHEL_77) || defined(RHEL_81)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
+  || defined(RHEL_77) || defined(RHEL_81)
         drm_connector_attach_encoder(connector, encoder);
 #else

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

@@ -212 +212 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
 static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
                                          unsigned long size,
@@ -230 +230 @@
         tt->func = &vbox_tt_backend_func;
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
 #else
@@ -244 +244 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
 # if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
 static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
 {
@@ -279 +279 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL_75)
 # if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         .io_mem_pfn = ttm_bo_default_io_mem_pfn,
 # endif
@@ -430 +430 @@
                           ttm_bo_type_device, &vboxbo->placement,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
                           align >> PAGE_SHIFT, false, NULL, acc_size,
 #else
@@ -460 +460 @@
 {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
-  || defined(OPENSUSE_151)
+  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -479 +479 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -498 +498 @@
 {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
-  || defined(OPENSUSE_151)
+  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -515 +515 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -534 +534 @@
 {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
-  || defined(OPENSUSE_151)
+  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -556 +556 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
-  && !defined(OPENSUSE_151)
+  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else