Changeset 66930 in vbox for trunk/src/VBox

Timestamp:

May 17, 2017 10:45:48 AM (8 years ago)

Author:

vboxsync

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

115459

Message:

Runtime/r0drv: Linux 4.12 5-level page table adaptions

File:

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

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

@@ -921 +921 @@
     if (RT_UNLIKELY(pgd_none(u.Global)))
         return NULL;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
     u.Four  = *p4d_offset(&u.Global, ulAddr);
     if (RT_UNLIKELY(p4d_none(u.Four)))
@@ -935 +936 @@
     }
     u.Upper = *pud_offset(&u.Four, ulAddr);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+# else /* < 4.12 */
     u.Upper = *pud_offset(&u.Global, ulAddr);
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+# endif /* < 4.12 */
     if (RT_UNLIKELY(pud_none(u.Upper)))
         return NULL;
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
     if (pud_large(u.Upper))
     {
@@ -951 +950 @@
         return pfn_to_page(pfn);
     }
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+# endif
     u.Middle = *pmd_offset(&u.Upper, ulAddr);
 #else  /* < 2.6.11 */