summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-05-04 16:07:51 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-05-04 16:07:51 +0000
commitf6a26a5c8469534f8df50b62b341b4d621b7d6e0 (patch)
tree53954b2f7c54f9b92ff9b76e70b788b7e1a8223e /sys/arch
parent78a0051709f9921887a64de499943ca12f19dcce (diff)
proto nicely
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mvme68k/mvme68k/disksubr.c5
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c7
-rw-r--r--sys/arch/mvme68k/mvme68k/vm_machdep.c14
3 files changed, 14 insertions, 12 deletions
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c
index 02ccac9f1c5..760bb0daae5 100644
--- a/sys/arch/mvme68k/mvme68k/disksubr.c
+++ b/sys/arch/mvme68k/mvme68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.4 1996/04/28 10:58:59 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.5 1996/05/04 16:07:47 deraadt Exp $ */
/*
* Copyright (c) 1995 Dale Rahn.
@@ -52,12 +52,11 @@ static void printlp __P((struct disklabel *lp, char *str));
static void printclp __P((struct cpu_disklabel *clp, char *str));
#endif
-int
+void
dk_establish(dk, dev)
struct disk *dk;
struct device *dev;
{
- return(-1);
}
/*
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 219f5486d02..fdf119f0b2a 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.7 1996/04/28 10:59:02 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.8 1996/05/04 16:07:49 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -160,6 +160,7 @@ extern struct emul emul_sunos;
* before vm init or startup. Do enough configuration
* to choose and initialize a console.
*/
+void
consinit()
{
@@ -1093,8 +1094,6 @@ boot(howto)
splhigh(); /* extreme priority */
if (howto&RB_HALT) {
printf("halted\n\n");
- while (1)
- ;
} else {
struct haltvec *hv;
@@ -1104,6 +1103,8 @@ boot(howto)
(*hv->hv_fn)();
doboot();
}
+ while (1)
+ ;
/*NOTREACHED*/
}
diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c
index fa64557e123..d3cd2256efe 100644
--- a/sys/arch/mvme68k/mvme68k/vm_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.5 1996/04/28 10:57:03 deraadt Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.6 1996/05/04 16:07:50 deraadt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -101,10 +101,10 @@ cpu_fork(p1, p2)
void
cpu_set_kpc(p, pc)
struct proc *p;
- u_long pc;
+ void (*pc) __P((struct proc *));
{
- p->p_addr->u_pcb.pcb_regs[6] = pc; /* A2 */
+ p->p_addr->u_pcb.pcb_regs[6] = (int)pc; /* A2 */
}
/*
@@ -139,10 +139,11 @@ cpu_cleanup(p)
* Dump the machine specific header information at the start of a core dump.
*/
int
-cpu_coredump(p, vp, cred)
+cpu_coredump(p, vp, cred, chdr)
struct proc *p;
struct vnode *vp;
struct ucred *cred;
+ struct core *chdr;
{
#ifdef COMPAT_HPUX
@@ -166,9 +167,10 @@ cpu_coredump(p, vp, cred)
* Both addresses are assumed to reside in the Sysmap,
* and size must be a multiple of CLSIZE.
*/
+void
pagemove(from, to, size)
- register caddr_t from, to;
- int size;
+ caddr_t from, to;
+ size_t size;
{
register vm_offset_t pa;