summaryrefslogtreecommitdiff
path: root/sys/arch/vax
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/arch/vax
parenta0a5a476bb860c6ea968db2071b67dd7d860bec2 (diff)
Generalize cpu_set_kpc to take any kind of arg; mostly from NetBSD
Diffstat (limited to 'sys/arch/vax')
-rw-r--r--sys/arch/vax/include/cpu.h3
-rw-r--r--sys/arch/vax/vax/vm_machdep.c9
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index 3639ebf1e4b..7462a4a397f 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.8 1997/09/12 09:21:19 maja Exp $ */
+/* $OpenBSD: cpu.h,v 1.9 1999/01/10 13:34:20 niklas Exp $ */
/* $NetBSD: cpu.h,v 1.24 1997/07/26 10:12:40 ragge Exp $ */
/*
@@ -107,7 +107,6 @@ extern int want_resched; /* resched() was called */
/* Some low-level prototypes */
int badaddr __P((caddr_t, int));
-void cpu_set_kpc __P((struct proc *, void (*)(struct proc *)));
void cpu_swapin __P((struct proc *));
int hp_getdev __P((int, int, char **));
int ra_getdev __P((int, int, int, char **));
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index 1979af06a0e..f6351660939 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.13 1998/07/28 00:13:56 millert Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.14 1999/01/10 13:34:19 niklas Exp $ */
/* $NetBSD: vm_machdep.c,v 1.33 1997/07/06 22:38:22 ragge Exp $ */
/*
@@ -157,9 +157,10 @@ cpu_fork(p1, p2)
* user mode.
*/
void
-cpu_set_kpc(p, pc)
+cpu_set_kpc(p, pc, arg)
struct proc *p;
- void (*pc) __P((struct proc *));
+ void (*pc) __P((void *));
+ void *arg;
{
struct pcb *nyproc;
struct {
@@ -175,7 +176,7 @@ cpu_set_kpc(p, pc)
kc->cf.ca_maskpsw = 0x20000000;
kc->cf.ca_pc = (unsigned)&sret;
kc->cf.ca_argno = 1;
- kc->cf.ca_arg1 = (unsigned)p;
+ kc->cf.ca_arg1 = (unsigned)arg;
kc->tf.r11 = boothowto; /* If we have old init */
kc->tf.psl = 0x3c00000;