Changeset 77464 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Feb 26, 2019 6:48:27 AM (6 years ago)

Author:

vboxsync

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

129040

Message:

Runtime/r0drv/linux: handle get_user_pages back-port to Linux 4.4.168.
ticketref:18315:Kernel modules do not build with linux kernel 4.4.169.
The previous attempt was bad, try again.

File:

• trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -1031 +1031 @@
     && LINUX_VERSION_CODE <  KERNEL_VERSION(4, 6, 0) \
     && defined(FAULT_FLAG_REMOTE)
-# define GET_USER_PAGES_API     KERNEL_VERSION(4, 10, 0) /* no typo! */
-/* The get_user_pages API change was back-ported to 4.4.168. */
-#elif    LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 168) \
-      && LINUX_VERSION_CODE <  KERNEL_VERSION(4, 5, 0)
 # define GET_USER_PAGES_API     KERNEL_VERSION(4, 10, 0) /* no typo! */
 #else
@@ -1120 +1116 @@
                                 R3Ptr,                  /* Where from. */
                                 cPages,                 /* How many pages. */
-# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 9, 0)
+/* The get_user_pages API change was back-ported to 4.4.168. */
+# if    LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 168) \
+      && LINUX_VERSION_CODE <  KERNEL_VERSION(4, 5, 0)
                                 fWrite ? FOLL_WRITE |   /* Write to memory. */
                                          FOLL_FORCE     /* force write access. */