diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2000-11-08 05:41:05 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2000-11-08 05:41:05 +0000 |
| commit | 2ffc5d21254419c9fc875aa2eb4c8686fe4da898 (patch) | |
| tree | de9a3f2aaf66ab681c9ccff153feeb1746bbc5f8 /sys/kern/init_main.c | |
| parent | de2fcefba2b81c5fb7c2c7f31f74f84d0eb569a7 (diff) | |
If MD code has defined curproc, don't do it here.
This is not a perfect solution.
Diffstat (limited to 'sys/kern/init_main.c')
| -rw-r--r-- | sys/kern/init_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index b0c9edbd48b..7b0f332ce2b 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.55 2000/06/18 03:07:48 angelos Exp $ */ +/* $OpenBSD: init_main.c,v 1.56 2000/11/08 05:41:04 art Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -118,7 +118,9 @@ struct pcred cred0; struct filedesc0 filedesc0; struct plimit limit0; struct vmspace vmspace0; -struct proc *curproc = &proc0; +#ifndef curproc +struct proc *curproc; +#endif struct proc *initproc; int cmask = CMASK; @@ -394,6 +396,7 @@ main(framep) VREF(filedesc0.fd_fd.fd_cdir); VOP_UNLOCK(rootvnode, 0, p); filedesc0.fd_fd.fd_rdir = NULL; + #if defined(UVM) uvm_swap_init(); #else @@ -618,6 +621,7 @@ start_init(arg) arg0 = ucp; uap = (char **)((u_long)ucp & ~ALIGNBYTES); #endif + /* * Move out the arg pointers. */ |