mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

Catch up with lim_* API changes on CURRENT.

Browse Source 
Submitted by:	mjg
Tested by:	Ivan Klymenko <fidaj@ukr.net>
This commit is contained in:
Jung-uk Kim 2015-06-10 20:59:14 +00:00
parent 5f355d3a49
commit bb6255c2d0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=389147
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
View File

@ -7,8 +7,8 @@ From Alan L. Cox on FreeBSD-current:
answer that question.
[1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2014-02-25 12:09:32.000000000 -0500
+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2014-03-17 13:57:00.000000000 -0400
--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2015-05-13 11:12:38.000000000 -0400
+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2015-06-10 16:42:33.632228000 -0400
@@ -168,14 +168,19 @@
VM_OBJECT_LOCK(pMemFreeBSD->pObject);
#endif
@ -113,3 +113,17 @@ From Alan L. Cox on FreeBSD-current:
}
#if __FreeBSD_version >= 1000030
VM_OBJECT_WUNLOCK(pObject);
@@ -743,7 +747,12 @@
{
/** @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 +
+#if __FreeBSD_version >= 1100077
+ lim_max_proc(pProc, RLIMIT_DATA));
+#else
+ lim_max(pProc, RLIMIT_DATA));
+#endif
PROC_UNLOCK(pProc);
}
else