Changeset 80269 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Aug 14, 2019 1:19:08 PM (6 years ago)

Author:

vboxsync

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

132721

Message:

Additions/linux/drm: eliminate unsafe include trickery (works almost always, but sometimes fails to do its magic job - the issue report was with Debian Sid using Linux 5.2 kernel)

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.module.kms (modified) (1 diff)
• vbox_ttm.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -48 +48 @@
         vbox_hgsmi.o
 VBOXMOD_INCL = \
-        $(VBOXDRM_DIR) \
-        include/drm
-## @todo r=bird: -Iinclude/drm is ambigious.
+        $(VBOXDRM_DIR)
 
 include $(obj)/Makefile-footer.gmk

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

@@ -34 +34 @@
  */
 #include "vbox_drv.h"
-#include <ttm/ttm_page_alloc.h>
+#include <drm/ttm/ttm_page_alloc.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)