diff options
author | Adriaan de Groot <adridg@FreeBSD.org> | 2020-09-26 11:17:53 +0000 |
---|---|---|
committer | Adriaan de Groot <adridg@FreeBSD.org> | 2020-09-26 11:17:53 +0000 |
commit | a6dee80daa3c05f1be273242b92bf11bb487e395 (patch) | |
tree | 3af0a9423490612ac719ee3bda3bbca96fd6030c /emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h | |
parent | 4eabfd600d3ba221ed235602f8b9b2ef9ffd055c (diff) | |
download | ports-a6dee80daa3c05f1be273242b92bf11bb487e395.tar.gz ports-a6dee80daa3c05f1be273242b92bf11bb487e395.zip |
MFH: r549922
emulators/virtualbox-ose-kmod: Fix a pair of VM bugs
- Use vm_pager_allocate() to allocate OBJT_PHYS objects. This ensures
that they're initialized properly.
- Don't assume that user wiring will succeed.
This had been a team effort, with multiple independent reports,
a wide variety of experiments, and patches written by kib@
and refined by markj@.
I'm bumping PORTREVISION and aligning the revision of both kmod and
application; it's possible the application bump isn't actually
needed but let's make sure they both get rebuilt with this
important (because of changed kernel assumptions) fix.
PR: 249326
Submitted by: kib, markj
Reported by: adridg, Rainer Hurling
Reviewed by: adridg
Approved by: koobs (vbox)
Approved by: ports-secteam (fluffy)
Notes
Notes:
svn path=/branches/2020Q3/; revision=550164
Diffstat (limited to 'emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h')
-rw-r--r-- | emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h index 5130dadb049a..47b7121abc8e 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_the-freebsd-kernel.h @@ -1,4 +1,4 @@ ---- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2018-10-15 14:31:31 UTC +--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2020-07-09 16:57:38 UTC +++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h @@ -60,6 +60,7 @@ #include <sys/smp.h> @@ -8,7 +8,11 @@ #include <vm/vm.h> #include <vm/pmap.h> /* for vtophys */ #include <vm/vm_map.h> -@@ -70,7 +71,6 @@ +@@ -67,10 +68,10 @@ + #include <vm/vm_kern.h> + #include <vm/vm_param.h> /* KERN_SUCCESS ++ */ + #include <vm/vm_page.h> ++#include <vm/vm_pager.h> #include <vm/vm_phys.h> /* vm_phys_alloc_* */ #include <vm/vm_extern.h> /* kmem_alloc_attr */ #include <vm/vm_pageout.h> /* vm_contig_grow_cache */ @@ -16,7 +20,7 @@ #include <sys/resourcevar.h> #include <machine/cpu.h> -@@ -114,6 +114,24 @@ +@@ -114,6 +115,24 @@ */ #if 0 /** @todo Not available yet. */ # define USE_KMEM_ALLOC_PROT |