From dd27878e7fa65cd4d2ac7834315f8fb5613720c2 Mon Sep 17 00:00:00 2001
From: gwr <gwr@NetBSD.org>
Date: Fri, 26 Apr 1996 18:37:58 +0000
Subject: [PATCH] Catch up with some prototype changes.

---
 sys/arch/sun3/sun3/disksubr.c   | 17 +++++++++++++----
 sys/arch/sun3/sun3/vm_machdep.c | 14 ++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/sys/arch/sun3/sun3/disksubr.c b/sys/arch/sun3/sun3/disksubr.c
index baa89a823ba5..3a8b519c89ac 100644
--- a/sys/arch/sun3/sun3/disksubr.c
+++ b/sys/arch/sun3/sun3/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.11 1995/11/17 23:30:19 gwr Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.12 1996/04/26 18:37:58 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -273,12 +273,21 @@ bad:
 	return(-1);
 }
 
-/* XXX - What is this for?  Where does it belong? -gwr */
-void
+/*
+ * This function appears to be called by each disk driver.
+ * Aparently this is to give this MD code a chance to do
+ * additional "device registration" types of work. (?)
+ * For example, the sparc port uses this to record the
+ * device node for the PROM-specified boot device.
+ *
+ * XXX: return value not documented (ignored everywhere)
+ */
+int
 dk_establish(dk, dev)
-	struct dkdevice *dk;
+	struct disk *dk;
 	struct device *dev;
 {
+	return 0;
 }
 
 /************************************************************************
diff --git a/sys/arch/sun3/sun3/vm_machdep.c b/sys/arch/sun3/sun3/vm_machdep.c
index 9fc7fec9b580..b6d2fcbdc2f3 100644
--- a/sys/arch/sun3/sun3/vm_machdep.c
+++ b/sys/arch/sun3/sun3/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.34 1996/02/20 22:05:39 gwr Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.35 1996/04/26 18:38:06 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -66,9 +66,6 @@
 
 extern int fpu_type;
 
-/* XXX - Put this in some header file? */
-void cpu_set_kpc __P((struct proc *p, u_long func));
-
 
 /*
  * Finish a fork operation, with process p2 nearly set up.
@@ -131,7 +128,7 @@ cpu_fork(p1, p2)
 	 * onto the stack of p2, very much like signal delivery.
 	 * When p2 runs, it will find itself in child_return().
 	 */
-	cpu_set_kpc(p2, (long)child_return);
+	cpu_set_kpc(p2, child_return);
 }
 
 /*
@@ -158,14 +155,14 @@ cpu_fork(p1, p2)
 void
 cpu_set_kpc(proc, func)
 	struct proc *proc;
-	u_long func;
+	void (*func)(struct proc *);
 {
 	struct pcb *pcbp;
 	struct switchframe *sf;
 	extern void proc_trampoline();
 	struct ksigframe {
 		struct switchframe sf;
-		u_long func;
+		void (*func)(struct proc *);
 		void *proc;
 	} *ksfp;
 
@@ -282,9 +279,10 @@ cpu_coredump(p, vp, cred, chdr)
  * Both addresses are assumed to reside in the kernel map,
  * and size must be a multiple of CLSIZE.
  */
+void
 pagemove(from, to, size)
 	register caddr_t from, to;
-	int size;
+	size_t size;
 {
 	register vm_offset_t pa;