diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /emulators/open-vm-kmod/files/patch-vmmemctl_os.c | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'emulators/open-vm-kmod/files/patch-vmmemctl_os.c')
| -rw-r--r-- | emulators/open-vm-kmod/files/patch-vmmemctl_os.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/emulators/open-vm-kmod/files/patch-vmmemctl_os.c b/emulators/open-vm-kmod/files/patch-vmmemctl_os.c index d083ec453d4f..899fd4d90a50 100644 --- a/emulators/open-vm-kmod/files/patch-vmmemctl_os.c +++ b/emulators/open-vm-kmod/files/patch-vmmemctl_os.c @@ -1,14 +1,12 @@ ---- vmmemctl/os.c.orig 2025-05-15 19:16:07 UTC +--- vmmemctl/os.c.orig 2025-09-30 06:45:41 UTC +++ vmmemctl/os.c @@ -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) + #define VM_PAGE_LOCK(page) vm_page_lock(page); + #define VM_PAGE_UNLOCK(page) vm_page_unlock(page) +#else +#define VM_PAGE_LOCK(page) vm_page_tryxbusy(page); +#define VM_PAGE_UNLOCK(page) vm_page_xunbusy(page) |