summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>1999-05-14 23:09:34 +0000
committeralc <alc@FreeBSD.org>1999-05-14 23:09:34 +0000
commite79d7db00beb4a2937430bdd6fc71ca1c91c6145 (patch)
tree1c85af899d8377c05ffc720589de279d803bb9fe /sys/kern
parent188a2f4871a753bcb906e6c1502ee302010b2390 (diff)
downloadFreeBSD-src-e79d7db00beb4a2937430bdd6fc71ca1c91c6145.zip
FreeBSD-src-e79d7db00beb4a2937430bdd6fc71ca1c91c6145.tar.gz
Simplify vm_map_find/insert's interface: remove the MAP_COPY_NEEDED option.
It never makes sense to specify MAP_COPY_NEEDED without also specifying MAP_COPY_ON_WRITE, and vice versa. Thus, MAP_COPY_ON_WRITE suffices. Reviewed by: David Greenman <dg@root.com>
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/imgact_aout.c6
-rw-r--r--sys/kern/imgact_elf.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 8378f43..f01a6c1 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: imgact_aout.c,v 1.49 1999/04/03 22:20:01 jdp Exp $
+ * $Id: imgact_aout.c,v 1.50 1999/05/09 16:04:06 peter Exp $
*/
#include <sys/param.h>
@@ -190,7 +190,7 @@ exec_aout_imgact(imgp)
file_offset,
virtual_offset, text_end,
VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_ALL,
- MAP_COPY_NEEDED | MAP_COPY_ON_WRITE);
+ MAP_COPY_ON_WRITE);
if (error) {
vm_map_unlock(map);
return (error);
@@ -202,7 +202,7 @@ exec_aout_imgact(imgp)
file_offset + a_out->a_text,
text_end, data_end,
VM_PROT_ALL, VM_PROT_ALL,
- MAP_COPY_NEEDED | MAP_COPY_ON_WRITE);
+ MAP_COPY_ON_WRITE);
if (error) {
vm_map_unlock(map);
return (error);
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index c1fef52..2934b94 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: imgact_elf.c,v 1.55 1999/02/20 23:52:34 jdp Exp $
+ * $Id: imgact_elf.c,v 1.56 1999/05/09 16:04:08 peter Exp $
*/
#include "opt_rlimit.h"
@@ -220,7 +220,7 @@ elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_o
map_addr + map_len,/* virtual end */
prot,
VM_PROT_ALL,
- MAP_COPY_NEEDED | MAP_COPY_ON_WRITE);
+ MAP_COPY_ON_WRITE);
vm_map_unlock(&vmspace->vm_map);
if (rv != KERN_SUCCESS)
return EINVAL;
@@ -270,7 +270,7 @@ elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_o
TRUE,
VM_PROT_READ,
VM_PROT_ALL,
- MAP_COPY_ON_WRITE | MAP_COPY_NEEDED);
+ MAP_COPY_ON_WRITE);
if (rv != KERN_SUCCESS) {
vm_object_deallocate(object);
return EINVAL;
OpenPOWER on IntegriCloud