diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2001-09-16 01:02:46 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2001-09-16 01:02:46 +0000 |
commit | db3dca6dbd32fe6ea3d51bc037e6f9cdc66c343b (patch) | |
tree | 29d590ca0bc9e66d81bc3218a0684c2daf9d4a68 /emulators/vmware3/files/patch-be | |
parent | Fix compilation problems. (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_4_0'.release/4.4.0
Notes
Notes:
svn path=/head/; revision=47856
svn path=/tags/RELEASE_4_4_0/; revision=47857; tag=release/4.4.0
Diffstat (limited to 'emulators/vmware3/files/patch-be')
-rw-r--r-- | emulators/vmware3/files/patch-be | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/emulators/vmware3/files/patch-be b/emulators/vmware3/files/patch-be deleted file mode 100644 index 1bfac1cee747..000000000000 --- a/emulators/vmware3/files/patch-be +++ /dev/null @@ -1,87 +0,0 @@ ---- vmmon-only/freebsd/hostif.c.orig Thu Jul 12 22:05:29 2001 -+++ vmmon-only/freebsd/hostif.c Thu Jul 12 22:14:09 2001 -@@ -55,7 +55,11 @@ - - #include <vm/vm.h> - #include <vm/vm_param.h> -+#if __FreeBSD_version >= 500018 -+#include <sys/mutex.h> -+#else - #include <sys/lock.h> -+#endif - #include <vm/pmap.h> - #include <vm/vm_map.h> - #include <vm/vm_page.h> -@@ -107,7 +111,16 @@ - - paddr = (vm_offset_t)addr; - m = PHYS_TO_VM_PAGE(paddr); -+#if __FreeBSD_version >= 500021 -+ GIANT_REQUIRED; -+#elif __FreeBSD_version >= 500013 -+ mtx_lock(&vm_mtx); -+#endif - vm_page_wire(m); -+#if __FreeBSD_version >= 500021 -+#elif __FreeBSD_version >= 500013 -+ mtx_unlock(&vm_mtx); -+#endif - return 0; - } - -@@ -120,7 +133,16 @@ - - paddr = (vm_offset_t)addr; - m = PHYS_TO_VM_PAGE(paddr); -+#if __FreeBSD_version >= 500021 -+ GIANT_REQUIRED; -+#elif __FreeBSD_version >= 500013 -+ mtx_lock(&vm_mtx); -+#endif - vm_page_unwire(m, 1); -+#if __FreeBSD_version >= 500021 -+#elif __FreeBSD_version >= 500013 -+ mtx_unlock(&vm_mtx); -+#endif - return 0; - } - -@@ -1066,10 +1088,19 @@ - return NULL; - } - paddr = vtophys(addr); -+#if __FreeBSD_version >= 500021 -+ GIANT_REQUIRED; -+#elif __FreeBSD_version >= 500013 -+ mtx_lock(&vm_mtx); -+#endif - ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE); - ka->map = PHYS_TO_VM_PAGE(paddr); - vm_page_wire(ka->map); - pmap_kenter(ka->kaddr, paddr); -+#if __FreeBSD_version >= 500021 -+#elif __FreeBSD_version >= 500013 -+ mtx_unlock(&vm_mtx); -+#endif - return ka->kaddr; - } - -@@ -1079,9 +1110,18 @@ - if (ka->map==NULL) - return 0; - -+#if __FreeBSD_version >= 500021 -+ GIANT_REQUIRED; -+#elif __FreeBSD_version >= 500013 -+ mtx_lock(&vm_mtx); -+#endif - vm_page_unwire(ka->map, 1); - pmap_kremove(ka->kaddr); - kmem_free(kernel_map, ka->kaddr, PAGE_SIZE); -+#if __FreeBSD_version >= 500021 -+#elif __FreeBSD_version >= 500013 -+ mtx_unlock(&vm_mtx); -+#endif - ka->kaddr = 0; - ka->map = NULL; - return 0; |