Index: uvm/uvm_map.c =================================================================== RCS file: /cvs/src/sys/uvm/uvm_map.c,v retrieving revision 1.204 diff -u -p -r1.204 uvm_map.c --- uvm/uvm_map.c 14 Nov 2015 14:53:14 -0000 1.204 +++ uvm/uvm_map.c 11 Dec 2015 18:47:51 -0000 @@ -183,15 +183,12 @@ int uvm_mapent_bias(struct vm_map*, s struct vm_map_entry *uvm_mapent_clone(struct vm_map*, vaddr_t, vsize_t, vsize_t, struct vm_map_entry*, struct uvm_map_deadq*, int, int); -struct vm_map_entry *uvm_mapent_forkshared(struct vmspace*, struct vm_map*, - struct vm_map*, struct vm_map_entry*, - struct uvm_map_deadq*); -struct vm_map_entry *uvm_mapent_forkcopy(struct vmspace*, struct vm_map*, - struct vm_map*, struct vm_map_entry*, - struct uvm_map_deadq*); -struct vm_map_entry *uvm_mapent_forkzero(struct vmspace*, struct vm_map*, - struct vm_map*, struct vm_map_entry*, - struct uvm_map_deadq*); +struct vm_map_entry *uvm_mapent_forkshared(struct vm_map*, struct vm_map*, + struct vm_map_entry*, struct uvm_map_deadq*); +struct vm_map_entry *uvm_mapent_forkcopy(struct vm_map*, struct vm_map*, + struct vm_map_entry*, struct uvm_map_deadq*); +struct vm_map_entry *uvm_mapent_forkzero(struct vm_map*, + struct vm_map_entry*, struct uvm_map_deadq*); /* * Tree validation. @@ -3418,8 +3415,7 @@ uvm_mapent_clone(struct vm_map *dstmap, * new entries to share amaps and backing objects. */ struct vm_map_entry * -uvm_mapent_forkshared(struct vmspace *new_vm, struct vm_map *new_map, - struct vm_map *old_map, +uvm_mapent_forkshared(struct vm_map *new_map, struct vm_map *old_map, struct vm_map_entry *old_entry, struct uvm_map_deadq *dead) { struct vm_map_entry *new_entry; @@ -3462,8 +3458,7 @@ uvm_mapent_forkshared(struct vmspace *ne * (note that new references are read-only). */ struct vm_map_entry * -uvm_mapent_forkcopy(struct vmspace *new_vm, struct vm_map *new_map, - struct vm_map *old_map, +uvm_mapent_forkcopy(struct vm_map *new_map, struct vm_map *old_map, struct vm_map_entry *old_entry, struct uvm_map_deadq *dead) { struct vm_map_entry *new_entry; @@ -3604,8 +3599,7 @@ uvm_mapent_forkcopy(struct vmspace *new_ * zero the mapping: the new entry will be zero initialized */ struct vm_map_entry * -uvm_mapent_forkzero(struct vmspace *new_vm, struct vm_map *new_map, - struct vm_map *old_map, +uvm_mapent_forkzero(struct vm_map *new_map, struct vm_map_entry *old_entry, struct uvm_map_deadq *dead) { struct vm_map_entry *new_entry; @@ -3682,16 +3676,16 @@ uvmspace_fork(struct process *pr) /* Apply inheritance. */ switch (old_entry->inheritance) { case MAP_INHERIT_SHARE: - new_entry = uvm_mapent_forkshared(vm2, new_map, + new_entry = uvm_mapent_forkshared(new_map, old_map, old_entry, &dead); break; case MAP_INHERIT_COPY: - new_entry = uvm_mapent_forkcopy(vm2, new_map, + new_entry = uvm_mapent_forkcopy(new_map, old_map, old_entry, &dead); break; case MAP_INHERIT_ZERO: - new_entry = uvm_mapent_forkzero(vm2, new_map, - old_map, old_entry, &dead); + new_entry = uvm_mapent_forkzero(new_map, + old_entry, &dead); break; default: continue;