diff options
| author |   niklas <niklas@openbsd.org> | 1996-03-03 17:19:36 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1996-03-03 17:19:36 +0000 |
| commit | 5ac46f4a009be3bdcce4d951fbd0eed1cac71377 (patch) | |
| tree | 1ebbc69319978d4a58e8f853e4ee407742c40cbd /sys/kern/kern_fork.c | |
| parent | From NetBSD: Use const qualifier with conversion, args and clist tables (diff) | |
| download | wireguard-openbsd-5ac46f4a009be3bdcce4d951fbd0eed1cac71377.tar.xz wireguard-openbsd-5ac46f4a009be3bdcce4d951fbd0eed1cac71377.zip | |
From NetBSD: 960217 merge
Diffstat (limited to 'sys/kern/kern_fork.c')
| -rw-r--r-- | sys/kern/kern_fork.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 589de5b0aec..8a836d44487 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,5 @@ -/* $NetBSD: kern_fork.c,v 1.27 1995/12/10 08:26:02 mycroft Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.5 1996/03/03 17:19:45 niklas Exp $ */ +/* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1991, 1993 @@ -46,6 +47,7 @@ #include <sys/filedesc.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/mount.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/vnode.h> @@ -53,17 +55,19 @@ #include <sys/acct.h> #include <sys/ktrace.h> -#include <vm/vm.h> - -#include <sys/mount.h> #include <sys/syscallargs.h> +#include <vm/vm.h> + int nprocs = 1; /* process 0 */ #define ISFORK 0 #define ISVFORK 1 #define ISRFORK 2 +int fork1 __P((struct proc *, int, int, register_t *)); + +/*ARGSUSED*/ int sys_fork(p, v, retval) struct proc *p; @@ -73,6 +77,7 @@ sys_fork(p, v, retval) return (fork1(p, ISFORK, 0, retval)); } +/*ARGSUSED*/ int sys_vfork(p, v, retval) struct proc *p; @@ -105,7 +110,6 @@ fork1(p1, forktype, rforkflags, retval) register struct proc *p2; register uid_t uid; struct proc *newproc; - struct proc **hash; int count; static int nextpid, pidchecked = 0; int dupfd = 1, cleanfd = 0; |