Changeset 77131 in vbox for trunk/src/VBox/Runtime/r0drv/freebsd

Timestamp:

Feb 1, 2019 5:29:01 PM (6 years ago)

Author:

vboxsync

Message:

the-freebsd-kernel.h,memobj-r0drv-freebsd.cpp: Build fix for newer FreeBSD versions

Location:

trunk/src/VBox/Runtime/r0drv/freebsd

Files:

• memobj-r0drv-freebsd.c (modified) (2 diffs)
• the-freebsd-kernel.h (modified) (1 diff)

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

@@ -236 +236 @@
         if (pPages)
             break;
+#if __FreeBSD_version >= 1100092
+        if (!vm_page_reclaim_contig(cTries, cPages, 0, VmPhysAddrHigh, PAGE_SIZE, 0))
+            break;
+#else
         vm_pageout_grow_cache(cTries, 0, VmPhysAddrHigh);
+#endif
         cTries++;
     }
@@ -737 +742 @@
         /** @todo is this needed?. */
         PROC_LOCK(pProc);
-        AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
+        AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + MY_LIM_MAX_PROC(pProc, RLIMIT_DATA));
         PROC_UNLOCK(pProc);
     }

trunk/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h

@@ -137 +137 @@
 #endif
 
+#if __FreeBSD_version >= 1100077
+# define MY_LIM_MAX_PROC(a_pProc, a_Limit) lim_max_proc((a_pProc), (a_Limit))
+#else
+# define MY_LIM_MAX_PROC(a_pProc, a_Limit) lim_max((a_pProc), (a_Limit))
+#endif
+
 /**
  * Check whether we can use kmem_alloc_attr for low allocs.