summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-11-12 01:26:11 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-11-12 01:26:11 +0000
commit6f622671e86434b2fa80299a0e9545fb83b45ca7 (patch)
treee7659c198c13ca9b253eef13911915a894742434 /sys/kern
parent1cf132e0e8e9b2b0914a758674d9861559da7781 (diff)
Bring in more changes from NetBSD. Mostly pagedaemon improvements.
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_exec.c4
-rw-r--r--sys/kern/kern_exit.c6
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 846af9b8fe7..2d12034b386 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exec.c,v 1.59 2001/11/06 19:53:20 miod Exp $ */
+/* $OpenBSD: kern_exec.c,v 1.60 2001/11/12 01:26:09 art Exp $ */
/* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */
/*-
@@ -383,7 +383,7 @@ sys_execve(p, v, retval)
* Prepare vmspace for remapping. Note that uvmspace_exec can replace
* p_vmspace!
*/
- uvmspace_exec(p);
+ uvmspace_exec(p, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS);
vm = p->p_vmspace;
/* Now map address space */
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 37c7da7480e..66efd893be8 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exit.c,v 1.36 2001/11/06 19:53:20 miod Exp $ */
+/* $OpenBSD: kern_exit.c,v 1.37 2001/11/12 01:26:09 art Exp $ */
/* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */
/*
@@ -143,10 +143,6 @@ exit1(p, rv)
/* The next three chunks should probably be moved to vmspace_exit. */
vm = p->p_vmspace;
-#ifdef SYSVSHM
- if (vm->vm_shm && vm->vm_refcnt == 1)
- shmexit(vm);
-#endif
#ifdef SYSVSEM
semexit(p);
#endif