make comments match the fact that we are on sun4u, plus minor cleanup

ok mickey@

5 files changed, 13 insertions, 17 deletions

diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c
index e89bb809d59..83b7b053803 100644
--- a/sys/arch/sparc64/dev/ce4231.c
+++ b/sys/arch/sparc64/dev/ce4231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ce4231.c,v 1.20 2005/07/09 22:23:15 miod Exp $	*/
+/*	$OpenBSD: ce4231.c,v 1.21 2005/09/08 15:25:54 martin Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -27,7 +27,7 @@
  */
 
 /*
- * Driver for CS4231 based audio found in some sun4m systems (cs4231)
+ * Driver for CS4231 based audio found in some sun4u systems (cs4231)
  * based on ideas from the S/Linux project and the NetBSD project.
  *
  * Effort sponsored in part by the Defense Advanced Research Projects
diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c
index 18c1932ca65..26f6d71156a 100644
--- a/sys/arch/sparc64/dev/sbus.c
+++ b/sys/arch/sparc64/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbus.c,v 1.22 2005/03/05 01:44:52 miod Exp $	*/
+/*	$OpenBSD: sbus.c,v 1.23 2005/09/08 15:25:54 martin Exp $	*/
 /*	$NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp $ */
 
 /*-
@@ -570,7 +570,7 @@ sbus_establish(struct sbusdev *sd, struct device *dev)
 
 	/*
 	 * We have to look for the sbus by name, since it is not necessarily
-	 * our immediate parent (i.e. sun4m /iommu/sbus/espdma/esp)
+	 * our immediate parent.
 	 * We don't just use the device structure of the above-attached
 	 * sbus, since we support multiple sbus's.
 	 */
diff --git a/sys/arch/sparc64/include/bsd_openprom.h b/sys/arch/sparc64/include/bsd_openprom.h
index 40c67837fe6..9a4b9fae0dd 100644
--- a/sys/arch/sparc64/include/bsd_openprom.h
+++ b/sys/arch/sparc64/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsd_openprom.h,v 1.4 2003/06/02 23:27:56 millert Exp $	*/
+/*	$OpenBSD: bsd_openprom.h,v 1.5 2005/09/08 15:25:55 martin Exp $	*/
 /*	$NetBSD: bsd_openprom.h,v 1.2 2000/03/13 23:52:34 soren Exp $ */
 
 /*
@@ -254,10 +254,10 @@ struct promvec {
 	 * easily.
 	 */
 	void	(*pv_setctxt)(int ctxt, caddr_t va, int pmeg);
-#if defined(SUN4M) && defined(notyet)
+#if defined(notyet)
 	/*
 	 * The following are V3 ROM functions to handle MP machines in the
-	 * Sun4m series. They have undefined results when run on a uniprocessor!
+	 * Sun4u series. They have undefined results when run on a uniprocessor!
 	 */
 	int	(*pv_v3cpustart)(u_int module, u_int ctxtbl,
 				      int context, caddr_t pc);
diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h
index 929aac42e2a..d9927ce3924 100644
--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.16 2005/07/31 15:31:17 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.17 2005/09/08 15:25:55 martin Exp $	*/
 /*	$NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */
 
 /*
@@ -247,13 +247,10 @@ extern void	delay(unsigned int);
 #define CPU_SUN4U	3
 
 /*
- * Shorthand CPU-type macros. Enumerate all eight cases.
+ * Shorthand CPU-type macros. Enumerate all seven cases.
  * Let compiler optimize away code conditional on constants.
  *
- * On a sun4 machine, the page size is 8192, while on a sun4c and sun4m
- * it is 4096. Therefore, in the (SUN4 && (SUN4C || SUN4M)) cases below,
- * NBPG, PGOFSET and PGSHIFT are defined as variables which are initialized
- * early in locore.s after the machine type has been detected.
+ * On a sun4u machine, the page size is 8192.
  *
  * Note that whenever the macros defined below evaluate to expressions
  * involving variables, the kernel will perform slighly worse due to the
diff --git a/sys/arch/sparc64/sparc64/cpuvar.h b/sys/arch/sparc64/sparc64/cpuvar.h
index 6437f636184..1f37e95337d 100644
--- a/sys/arch/sparc64/sparc64/cpuvar.h
+++ b/sys/arch/sparc64/sparc64/cpuvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuvar.h,v 1.5 2003/11/03 07:01:33 david Exp $	*/
+/*	$OpenBSD: cpuvar.h,v 1.6 2005/09/08 15:25:55 martin Exp $	*/
 /*	$NetBSD: cpuvar.h,v 1.2 1999/11/06 20:18:13 eeh Exp $ */
 
 /*
@@ -47,9 +47,8 @@
 /*
  * The cpu_softc structure. This structure maintains information about one
  * currently installed CPU (there may be several of these if the machine
- * supports multiple CPUs, as on some Sun4m architectures). The information
- * in this structure supersedes the old "cpumod", "mmumod", and similar
- * fields.
+ * supports multiple CPUs). The information in this structure supersedes the
+ * old "cpumod", "mmumod", and similar fields.
  */
 
 struct cpu_softc {