NETBSD_CURRENT_970916. Lot's just ID changes, since changes don't apply to

us.  Includes some pmap changes, for which I don't have the original commit
message(s) handy.

7 files changed, 24 insertions, 24 deletions

diff --git a/sys/arch/sparc/conf/FLOPPY b/sys/arch/sparc/conf/FLOPPY
index 75ab76c8c03..e609c89a6fb 100644
--- a/sys/arch/sparc/conf/FLOPPY
+++ b/sys/arch/sparc/conf/FLOPPY
@@ -1,4 +1,4 @@
-# 	$OpenBSD: FLOPPY,v 1.15 1997/06/23 19:05:41 kstailey Exp $
+# 	$OpenBSD: FLOPPY,v 1.16 1997/09/17 06:47:02 downsj Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -108,8 +108,8 @@ obio0	at mainbus0				# sun4 and sun4m
 iommu0	at mainbus0				# sun4m
 sbus0	at iommu0				# sun4m
 
-#audio0	at mainbus0				# sun4c
-#audio0	at obio0				# sun4m
+#audioamd0 at mainbus0				# sun4c
+#audioamd0 at obio0				# sun4m
 
 auxreg0	at mainbus0				# sun4c
 auxreg0	at obio0				# sun4m
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 2d272b9b719..0fb4c192b85 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERIC,v 1.18 1997/08/08 08:47:10 downsj Exp $
-# 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
+#	$OpenBSD: GENERIC,v 1.19 1997/09/17 06:47:03 downsj Exp $
+# 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc
@@ -40,9 +40,9 @@ vmel0	at mainbus0				# sun4
 iommu0	at mainbus0				# sun4m
 sbus0	at iommu0				# sun4m
 
-audio0	at mainbus0				# sun4c
-audio0	at obio0				# sun4m
-audio0	at sbus0 slot ? offset ?		# sun4m
+audioamd0 at mainbus0				# sun4c
+audioamd0 at obio0				# sun4m
+audioamd0 at sbus0 slot ? offset ?		# sun4m
 
 auxreg0	at mainbus0				# sun4c
 auxreg0	at obio0				# sun4m
diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3
index c49a44ffed8..9454ab0850a 100644
--- a/sys/arch/sparc/conf/GENERIC_SCSI3
+++ b/sys/arch/sparc/conf/GENERIC_SCSI3
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC_SCSI3,v 1.16 1997/08/08 08:47:11 downsj Exp $
+#	$OpenBSD: GENERIC_SCSI3,v 1.17 1997/09/17 06:47:03 downsj Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -40,9 +40,9 @@ vmel0	at mainbus0				# sun4
 iommu0	at mainbus0				# sun4m
 sbus0	at iommu0				# sun4m
 
-audio0	at mainbus0				# sun4c
-audio0	at obio0				# sun4m
-audio0	at sbus0 slot ? offset ?		# sun4m
+audioamd0 at mainbus0				# sun4c
+audioamd0 at obio0				# sun4m
+audioamd0 at sbus0 slot ? offset ?		# sun4m
 
 auxreg0	at mainbus0				# sun4c
 auxreg0	at obio0				# sun4m
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index c963e874815..3b0b8b23519 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -63,8 +63,8 @@ vmel0	at mainbus0				# sun4
 iommu0	at mainbus0				# sun4m
 sbus0	at iommu0				# sun4m
 
-audio0	at mainbus0				# sun4c
-audio0	at obio0				# sun4m
+audioamd0 at mainbus0				# sun4c
+audioamd0 at obio0				# sun4m
 
 auxreg0	at mainbus0				# sun4c
 auxreg0	at obio0				# sun4m
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 7b0cfb65285..ee1e5d80873 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -61,7 +61,7 @@ sbus0	at mainbus0
 #vmes0	at mainbus0
 #vmel0	at mainbus0
 
-audio0	at mainbus0
+audioamd0 at mainbus0
 auxreg0	at mainbus0
 clock0	at mainbus0
 #clock0	at obio0 addr 0xf2000000
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 8957f6e6c15..2a8dbea1aa3 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.14 1997/08/08 09:56:05 downsj Exp $
+#	$OpenBSD: SUN4M,v 1.15 1997/09/17 06:47:04 downsj Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -32,8 +32,8 @@ obio0	at mainbus0				# sun4 and sun4m
 iommu0	at mainbus0				# sun4m
 sbus0	at iommu0				# sun4m
 
-audio0	at obio0				# sun4m
-audio0	at sbus0 slot ? offset ?		# sun4m
+audioamd0 at obio0				# sun4m
+audioamd0 at sbus0 slot ? offset ?		# sun4m
 
 auxreg0	at obio0				# sun4m
 
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index a2a926edeeb..dc6105a328a 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.sparc,v 1.13 1997/08/25 08:38:43 downsj Exp $
-#	$NetBSD: files.sparc,v 1.40 1997/07/07 21:53:43 pk Exp $
+#	$OpenBSD: files.sparc,v 1.14 1997/09/17 06:47:05 downsj Exp $
+#	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
 # sparc-specific configuration info
@@ -101,8 +101,8 @@ device esp: scsi, ncr53c9x
 attach esp at sbus, dma, obio
 file	arch/sparc/dev/esp.c		esp
 
-device audio
-attach audio at mainbus, obio, sbus
+device audioamd: audio
+attach audioamd at mainbus, obio, sbus
 file	arch/sparc/dev/amd7930.c	audio
 file	arch/sparc/sparc/amd7930intr.s	audio
 
@@ -211,7 +211,7 @@ file	arch/sparc/sparc/conf.c
 file	arch/sparc/sparc/emul.c
 file	arch/sparc/sparc/in_cksum.c
 file	arch/sparc/sparc/intr.c
-file	arch/sparc/sparc/kgdb_stub.c
+file	arch/sparc/sparc/kgdb_machdep.c	kgdb
 # sparc/sparc/locore.s is handled specially in the makefile,
 # because it must come first in the "ld" command line.
 file	arch/sparc/sparc/locore2.c
@@ -230,7 +230,7 @@ file	arch/sparc/sparc/disksubr.c
 
 file	kludge_for_in_proto.c		hy needs-flag
 
-file	arch/sparc/sparc/db_interface.c	ddb
+file	arch/sparc/sparc/db_interface.c	ddb | kgdb
 file	arch/sparc/sparc/db_trace.c	ddb
 file	arch/sparc/sparc/db_disasm.c	ddb