summaryrefslogtreecommitdiff
path: root/sys/kern/init_main.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-01-10 13:34:21 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-01-10 13:34:21 +0000
commit771be10e033278ba3fe87b2fad592c9852b3e663 (patch)
tree0a6d3d603627743134eb50aae080763e88c0d49d /sys/kern/init_main.c
parenta0a5a476bb860c6ea968db2071b67dd7d860bec2 (diff)
Generalize cpu_set_kpc to take any kind of arg; mostly from NetBSD
Diffstat (limited to 'sys/kern/init_main.c')
-rw-r--r--sys/kern/init_main.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 00bb7d0d476..35577b21656 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.33 1999/01/02 00:38:37 deraadt Exp $ */
+/* $OpenBSD: init_main.c,v 1.34 1999/01/10 13:34:17 niklas Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -126,9 +126,9 @@ struct timeval runtime;
/* XXX return int so gcc -Werror won't complain */
int main __P((void *));
void check_console __P((struct proc *));
-void start_init __P((struct proc *));
-void start_pagedaemon __P((struct proc *));
-void start_update __P((struct proc *));
+void start_init __P((void *));
+void start_pagedaemon __P((void *));
+void start_update __P((void *));
#ifdef cpu_set_init_frame
void *initframep; /* XXX should go away */
@@ -389,7 +389,7 @@ main(framep)
return 0;
}
#else
- cpu_set_kpc(pfind(1), start_init);
+ cpu_set_kpc(pfind(1), start_init, pfind(1));
#endif
/* Create process 2 (the pageout daemon). */
@@ -403,7 +403,7 @@ main(framep)
start_pagedaemon(curproc);
}
#else
- cpu_set_kpc(pfind(2), start_pagedaemon);
+ cpu_set_kpc(pfind(2), start_pagedaemon, pfind(2));
#endif
/* Create process 3 (the update daemon). */
@@ -417,7 +417,7 @@ main(framep)
start_update(curproc);
}
#else
- cpu_set_kpc(pfind(3), start_update);
+ cpu_set_kpc(pfind(3), start_update, pfind(3));
#endif
microtime(&rtv);
@@ -462,9 +462,10 @@ check_console(p)
* The program is invoked with one argument containing the boot flags.
*/
void
-start_init(p)
- struct proc *p;
+start_init(arg)
+ void *arg;
{
+ struct proc *p = arg;
vm_offset_t addr;
struct sys_execve_args /* {
syscallarg(char *) path;
@@ -577,9 +578,10 @@ start_init(p)
}
void
-start_pagedaemon(p)
- struct proc *p;
+start_pagedaemon(arg)
+ void *arg;
{
+ struct proc *p = arg;
/*
* Now in process 2.
@@ -591,9 +593,10 @@ start_pagedaemon(p)
}
void
-start_update(p)
- struct proc *p;
+start_update(arg)
+ void *arg;
{
+ struct proc *p = arg;
/*
* Now in process 3.