diff options
Diffstat (limited to 'emulators/open-vm-kmod')
| -rw-r--r-- | emulators/open-vm-kmod/Makefile | 2 | ||||
| -rw-r--r-- | emulators/open-vm-kmod/distinfo | 6 | ||||
| -rw-r--r-- | emulators/open-vm-kmod/files/patch-vmmemctl_os.c | 22 |
3 files changed, 23 insertions, 7 deletions
diff --git a/emulators/open-vm-kmod/Makefile b/emulators/open-vm-kmod/Makefile index 751955b440c3..a7c726caf9fe 100644 --- a/emulators/open-vm-kmod/Makefile +++ b/emulators/open-vm-kmod/Makefile @@ -1,5 +1,5 @@ PORTNAME= open-vm-kmod -PORTVERSION= 12.5.0 +PORTVERSION= 12.5.2 DISTVERSIONPREFIX= stable- PORTEPOCH= 2 CATEGORIES= emulators diff --git a/emulators/open-vm-kmod/distinfo b/emulators/open-vm-kmod/distinfo index 2f34cde2a8c0..884191452e52 100644 --- a/emulators/open-vm-kmod/distinfo +++ b/emulators/open-vm-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733928741 -SHA256 (vmware-open-vm-tools-stable-12.5.0_GH0.tar.gz) = a52182c7e6b5df41bb317625e9d8592ecdb9db814d1c2c9b7cdb91a77f8c0640 -SIZE (vmware-open-vm-tools-stable-12.5.0_GH0.tar.gz) = 3001944 +TIMESTAMP = 1750427304 +SHA256 (vmware-open-vm-tools-stable-12.5.2_GH0.tar.gz) = 9fa2ebda1aaf53c163a978832775d845378d9ce59032c07b1c63b84ba091610f +SIZE (vmware-open-vm-tools-stable-12.5.2_GH0.tar.gz) = 3004283 diff --git a/emulators/open-vm-kmod/files/patch-vmmemctl_os.c b/emulators/open-vm-kmod/files/patch-vmmemctl_os.c index d096f92236c3..d083ec453d4f 100644 --- a/emulators/open-vm-kmod/files/patch-vmmemctl_os.c +++ b/emulators/open-vm-kmod/files/patch-vmmemctl_os.c @@ -1,6 +1,22 @@ ---- vmmemctl/os.c.orig 2024-10-10 15:05:07 UTC +--- vmmemctl/os.c.orig 2025-05-15 19:16:07 UTC +++ vmmemctl/os.c -@@ -103,7 +103,11 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta +@@ -91,8 +91,13 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta + /* + * FreeBSD specific MACROS + */ +-#define VM_PAGE_LOCK(page) vm_page_lock(page); +-#define VM_PAGE_UNLOCK(page) vm_page_unlock(page) ++#if __FreeBSD_version < 1500046 ++#define VM_PAGE_LOCK(page) vm_page_tryxbusy(page); ++#define VM_PAGE_UNLOCK(page) vm_page_xunbusy(page) ++#else ++#define VM_PAGE_LOCK(page) vm_page_tryxbusy(page); ++#define VM_PAGE_UNLOCK(page) vm_page_xunbusy(page) ++#endif + + #define VM_OBJ_LOCK(object) VM_OBJECT_WLOCK(object) + #define VM_OBJ_UNLOCK(object) VM_OBJECT_WUNLOCK(object); +@@ -103,7 +108,11 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta #define KVA_FREE(offset, size) kva_free(offset, size) #define KMEM_ALLOC(size) kmem_malloc(size, M_WAITOK | M_ZERO) @@ -13,7 +29,7 @@ /* * Globals -@@ -404,7 +408,7 @@ os_pmap_free(os_pmap *p) // IN +@@ -404,7 +413,7 @@ os_pmap_free(os_pmap *p) // IN static void os_pmap_free(os_pmap *p) // IN { |