diff options
| author | dyson <dyson@FreeBSD.org> | 1997-02-10 02:22:35 +0000 |
|---|---|---|
| committer | dyson <dyson@FreeBSD.org> | 1997-02-10 02:22:35 +0000 |
| commit | 10f666af84d48e89e4e2960415c9b616fce4077f (patch) | |
| tree | 88a944de263165091f0a18abeedbaaccec532407 /sys/vm/vm_glue.c | |
| parent | 0960d7e91af3428ffba89b42228d82d8afaa0389 (diff) | |
| download | FreeBSD-src-10f666af84d48e89e4e2960415c9b616fce4077f.zip FreeBSD-src-10f666af84d48e89e4e2960415c9b616fce4077f.tar.gz | |
This is the kernel Lite/2 commit. There are some requisite userland
changes, so don't expect to be able to run the kernel as-is (very well)
without the appropriate Lite/2 userland changes.
The system boots and can mount UFS filesystems.
Untested: ext2fs, msdosfs, NFS
Known problems: Incorrect Berkeley ID strings in some files.
Mount_std mounts will not work until the getfsent
library routine is changed.
Reviewed by: various people
Submitted by: Jeffery Hsu <hsu@freebsd.org>
Diffstat (limited to 'sys/vm/vm_glue.c')
| -rw-r--r-- | sys/vm/vm_glue.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 25290e6..84197ea 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -79,7 +79,7 @@ #include <vm/vm_param.h> #include <vm/vm_inherit.h> #include <vm/vm_prot.h> -#include <vm/lock.h> +#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_page.h> @@ -424,9 +424,11 @@ retry: vm_map_reference(&vm->vm_map); /* * do not swapout a process that is waiting for VM - * datastructures there is a possible deadlock. + * data structures there is a possible deadlock. */ - if (!lock_try_write(&vm->vm_map.lock)) { + if (lockmgr(&vm->vm_map.lock, + LK_EXCLUSIVE | LK_NOWAIT, + (void *)0, curproc)) { vm_map_deallocate(&vm->vm_map); vmspace_free(vm); continue; |
