git: 5e788414f6c7 - main - emulators/open-vm-tools: Update for changes to kmem_*() in main.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Sep 2022 23:27:37 UTC
The branch main has been updated by jhb (doc, src committer):
URL: https://cgit.FreeBSD.org/ports/commit/?id=5e788414f6c75d1afb9ebb960144bc82c03a0c86
commit 5e788414f6c75d1afb9ebb960144bc82c03a0c86
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-09-26 23:27:08 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-09-26 23:27:08 +0000
emulators/open-vm-tools: Update for changes to kmem_*() in main.
Reviewed by: garga
Sponsored by: DARPA
Differential Revision: https://reviews.freebsd.org/D36734
---
.../files/patch-modules_freebsd_vmmemctl_os.c | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
new file mode 100644
index 000000000000..2aee754762a6
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
@@ -0,0 +1,25 @@
+--- modules/freebsd/vmmemctl/os.c.orig 2022-09-13 12:55:59 UTC
++++ modules/freebsd/vmmemctl/os.c
+@@ -136,9 +136,11 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta
+ #endif
+
+ #if __FreeBSD_version < 1000000
+- #define KMEM_FREE(offset, size) kmem_free(kernel_map, offset, size)
++ #define KMEM_FREE(offset, size) kmem_free(kernel_map, (vm_offset_t)offset, size)
+ #elif __FreeBSD_version < 1200083
+- #define KMEM_FREE(offset, size) kmem_free(kernel_arena, offset, size)
++ #define KMEM_FREE(offset, size) kmem_free(kernel_arena, (vm_offset_t)offset, size)
++#elif __FreeBSD_version < 1400070
++ #define KMEM_FREE(offset, size) kmem_free((vm_offset_t)offset, size)
+ #else
+ #define KMEM_FREE(offset, size) kmem_free(offset, size)
+ #endif
+@@ -442,7 +444,7 @@ os_pmap_free(os_pmap *p) // IN
+ static void
+ os_pmap_free(os_pmap *p) // IN
+ {
+- KMEM_FREE((vm_offset_t)p->bitmap, p->size);
++ KMEM_FREE(p->bitmap, p->size);
+ p->size = 0;
+ p->bitmap = NULL;
+ }