Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only expect vm_fork() to return if __FORK_BRAINDAMAGE is defined. 

Eliminate unused third arg to vm_fork().
This commit is contained in:
mycroft 1995-12-09 04:28:16 +00:00
parent af942a9add
commit fee1a345eb
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/vm/vm_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_extern.h,v 1.14 1995/09/27 20:30:17 thorpej Exp $ */ /* $NetBSD: vm_extern.h,v 1.15 1995/12/09 04:28:16 mycroft Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -103,7 +103,11 @@ void vm_fault_copy_entry __P((vm_map_t,
vm_map_t, vm_map_entry_t, vm_map_entry_t)); vm_map_t, vm_map_entry_t, vm_map_entry_t));
void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t)); void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t));
int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t)); int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
int vm_fork __P((struct proc *, struct proc *, int)); #ifdef __FORK_BRAINDAMAGE
int vm_fork __P((struct proc *, struct proc *));
#else
void vm_fork __P((struct proc *, struct proc *));
#endif
int vm_inherit __P((vm_map_t, int vm_inherit __P((vm_map_t,
vm_offset_t, vm_size_t, vm_inherit_t)); vm_offset_t, vm_size_t, vm_inherit_t));
void vm_init_limits __P((struct proc *)); void vm_init_limits __P((struct proc *));

22
sys/vm/vm_glue.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_glue.c,v 1.47 1995/08/13 09:04:47 mycroft Exp $ */ /* $NetBSD: vm_glue.c,v 1.48 1995/12/09 04:28:19 mycroft Exp $ */
/* /*
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -202,10 +202,13 @@ vsunlock(addr, len, dirtied)
* after cpu_fork returns in the child process. We do nothing here * after cpu_fork returns in the child process. We do nothing here
* after cpu_fork returns. * after cpu_fork returns.
*/ */
#ifdef __FORK_BRAINDAMAGE
int int
vm_fork(p1, p2, isvfork) #else
void
#endif
vm_fork(p1, p2)
register struct proc *p1, *p2; register struct proc *p1, *p2;
int isvfork;
{ {
register struct user *up; register struct user *up;
vm_offset_t addr; vm_offset_t addr;
@ -222,7 +225,7 @@ vm_fork(p1, p2, isvfork)
#ifdef SYSVSHM #ifdef SYSVSHM
if (p1->p_vmspace->vm_shm) if (p1->p_vmspace->vm_shm)
shmfork(p1, p2, isvfork); shmfork(p1, p2);
#endif #endif
#if !defined(i386) && !defined(pc532) #if !defined(i386) && !defined(pc532)
@ -272,6 +275,8 @@ vm_fork(p1, p2, isvfork)
(void)vm_map_inherit(vp, addr, VM_MAX_ADDRESS, VM_INHERIT_NONE); (void)vm_map_inherit(vp, addr, VM_MAX_ADDRESS, VM_INHERIT_NONE);
} }
#endif #endif
#ifdef __FORK_BRAINDAMAGE
/* /*
* cpu_fork will copy and update the kernel stack and pcb, * cpu_fork will copy and update the kernel stack and pcb,
* and make the child ready to run. It marks the child * and make the child ready to run. It marks the child
@ -280,6 +285,15 @@ vm_fork(p1, p2, isvfork)
* once in the child. * once in the child.
*/ */
return (cpu_fork(p1, p2)); return (cpu_fork(p1, p2));
#else
/*
* cpu_fork will copy and update the kernel stack and pcb,
* and make the child ready to run. The child will exit
* directly to user mode on its first time slice, and will
* not return here.
*/
cpu_fork(p1, p2);
#endif
} }
/* /*