From 84eb329d142196d93ffdafcce7b37c492391cd2e Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Tue, 14 May 2002 02:03:00 +0000
Subject: [PATCH] Eliminate commons (including many used ones).  Clean up
 variable references.

---
 sys/arch/luna68k/luna68k/locore.s  | 4 +---
 sys/arch/mac68k/mac68k/fpu.c       | 3 +--
 sys/arch/mvme68k/dev/sbicvar.h     | 4 ++--
 sys/arch/mvme68k/dev/vme_two_68k.c | 4 ++--
 sys/arch/mvme68k/mvme68k/locore.s  | 4 +---
 sys/arch/news68k/news68k/locore.s  | 4 +---
 sys/arch/next68k/conf/GENERIC      | 6 +++---
 sys/arch/next68k/include/cpu.h     | 6 +++---
 sys/arch/x68k/dev/rtclock.c        | 6 ++----
 sys/arch/x68k/dev/rtclock_var.h    | 6 +++++-
 sys/arch/x68k/x68k/iodevice.h      | 4 ++--
 11 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/sys/arch/luna68k/luna68k/locore.s b/sys/arch/luna68k/luna68k/locore.s
index bf55c4bea0ed..48d69be22825 100644
--- a/sys/arch/luna68k/luna68k/locore.s
+++ b/sys/arch/luna68k/luna68k/locore.s
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.14 2001/08/25 21:08:02 chs Exp $ */
+/* $NetBSD: locore.s,v 1.15 2002/05/14 02:03:00 matt Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1406,8 +1406,6 @@ GLOBAL(want_resched)
 	.long   0
 GLOBAL(proc0paddr)
 	.long	0
-GLOBAL(boothowto)
-	.long	0
 GLOBAL(bootdev)
 	.long	0
 GLOBAL(hwplanemask)
diff --git a/sys/arch/mac68k/mac68k/fpu.c b/sys/arch/mac68k/mac68k/fpu.c
index 37611775f78f..71fb1c7b2634 100644
--- a/sys/arch/mac68k/mac68k/fpu.c
+++ b/sys/arch/mac68k/mac68k/fpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.25 2001/11/20 03:19:42 chs Exp $	*/
+/*	$NetBSD: fpu.c,v 1.26 2002/05/14 02:03:01 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -54,7 +54,6 @@
 /*
  * FPU type; emulator uses FPU_NONE
  */
-int     fputype;
 
 extern label_t *nofault;
 
diff --git a/sys/arch/mvme68k/dev/sbicvar.h b/sys/arch/mvme68k/dev/sbicvar.h
index 25bd9d262ad9..21d8410f6cb8 100644
--- a/sys/arch/mvme68k/dev/sbicvar.h
+++ b/sys/arch/mvme68k/dev/sbicvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbicvar.h,v 1.8 2001/04/25 17:53:17 bouyer Exp $	*/
+/*	$NetBSD: sbicvar.h,v 1.9 2002/05/14 02:03:01 matt Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -87,7 +87,7 @@ struct sbic_tinfo {
     int                     cmds;       /* #commands processed */
     int                     dconns;     /* #disconnects */
     int                     lubusy;     /* What local units/subr. are busy? */
-} tinfo_t;
+};
 
 struct  sbic_softc {
     struct  device          sc_dev;
diff --git a/sys/arch/mvme68k/dev/vme_two_68k.c b/sys/arch/mvme68k/dev/vme_two_68k.c
index 4a41572d55ad..52c1d0ce7d57 100644
--- a/sys/arch/mvme68k/dev/vme_two_68k.c
+++ b/sys/arch/mvme68k/dev/vme_two_68k.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme_two_68k.c,v 1.2 2002/03/24 17:22:33 scw Exp $	*/
+/*	$NetBSD: vme_two_68k.c,v 1.3 2002/05/14 02:03:01 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@ void vmetwo_attach __P((struct device *, struct device *, void *));
 struct cfattach vmetwo_ca = {
 	sizeof(struct vmetwo_softc), vmetwo_match, vmetwo_attach
 };
-struct cfdriver vmetwo_cd;
+extern struct cfdriver vmetwo_cd;
 
 
 /* ARGSUSED */
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index eb5dbbe00622..c6e0b9762151 100644
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.88 2001/07/27 18:58:23 scw Exp $	*/
+/*	$NetBSD: locore.s,v 1.89 2002/05/14 02:03:02 matt Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1794,8 +1794,6 @@ GLOBAL(bootctrllun)
 	.long	0
 GLOBAL(bootaddr)
 	.long	0
-GLOBAL(boothowto)
-	.long	0
 
 GLOBAL(want_resched)
 	.long	0
diff --git a/sys/arch/news68k/news68k/locore.s b/sys/arch/news68k/news68k/locore.s
index 88d4556f6baf..afd213c61b53 100644
--- a/sys/arch/news68k/news68k/locore.s
+++ b/sys/arch/news68k/news68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.24 2001/07/22 13:34:06 wiz Exp $	*/
+/*	$NetBSD: locore.s,v 1.25 2002/05/14 02:03:02 matt Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1527,8 +1527,6 @@ GLOBAL(bootctrllun)
 	.long	0
 GLOBAL(bootaddr)
 	.long	0
-GLOBAL(boothowto)
-	.long	0
 
 GLOBAL(want_resched)
 	.long	0
diff --git a/sys/arch/next68k/conf/GENERIC b/sys/arch/next68k/conf/GENERIC
index 33dab0e161e8..4faf1fd35729 100644
--- a/sys/arch/next68k/conf/GENERIC
+++ b/sys/arch/next68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.55 2002/04/25 15:06:34 atatat Exp $
+# $NetBSD: GENERIC,v 1.56 2002/05/14 02:03:02 matt Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/next68k/conf/std.next68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.55 $"
+#ident 		"GENERIC-$Revision: 1.56 $"
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	16
@@ -103,7 +103,7 @@ file-system 	UNION		# union file system
 
 options 	NFSSERVER	# nfs server support
 options 	QUOTA		# FFS quotas
-options 	SOFTDEP		# FFS soft updates support.
+#options 	SOFTDEP		# FFS soft updates support.
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
 				# immutable) behave as system flags.
 
diff --git a/sys/arch/next68k/include/cpu.h b/sys/arch/next68k/include/cpu.h
index e2319f7bd835..677c8acea745 100644
--- a/sys/arch/next68k/include/cpu.h
+++ b/sys/arch/next68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.18 2001/05/30 12:28:48 mrg Exp $	*/
+/*	$NetBSD: cpu.h,v 1.19 2002/05/14 02:03:02 matt Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -133,8 +133,8 @@ extern int want_resched; 	/* resched() was called */
 
 #define aston() (astpending++)
 
-int	astpending;	/* need to trap before returning to user mode */
-int	want_resched;	/* resched() was called */
+extern	int	astpending;	/* need to trap before returning to user mode */
+extern	int	want_resched;	/* resched() was called */
 
 extern	volatile char *intiobase;
 extern  volatile char *intiolimit;
diff --git a/sys/arch/x68k/dev/rtclock.c b/sys/arch/x68k/dev/rtclock.c
index 2f3e16fa50bf..06c05f605c1b 100644
--- a/sys/arch/x68k/dev/rtclock.c
+++ b/sys/arch/x68k/dev/rtclock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtclock.c,v 1.10 2001/05/26 21:32:30 minoura Exp $	*/
+/*	$NetBSD: rtclock.c,v 1.11 2002/05/14 02:03:03 matt Exp $	*/
 
 /*
  * Copyright 1993, 1994 Masaru Oki
@@ -117,11 +117,9 @@ rtc_attach(parent, self, aux)
 
 
 /*
- * x68k/clock.c calls thru this vector, if it is set, to read
+ * x68k/clock.c calls thru the get/set tod vector, if it is set, to read
  * the realtime clock.
  */
-time_t (*gettod) __P((void));
-int (*settod) __P((long));
 
 int
 rtclockinit()
diff --git a/sys/arch/x68k/dev/rtclock_var.h b/sys/arch/x68k/dev/rtclock_var.h
index b51cb789f077..c675d30e8b09 100644
--- a/sys/arch/x68k/dev/rtclock_var.h
+++ b/sys/arch/x68k/dev/rtclock_var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtclock_var.h,v 1.4 2001/01/15 07:04:41 itohy Exp $	*/
+/*	$NetBSD: rtclock_var.h,v 1.5 2002/05/14 02:03:03 matt Exp $	*/
 
 /*
  * Copyright 1993, 1994 Masaru Oki
@@ -96,4 +96,8 @@ struct rtc_softc {
 #define	range_test0(n, h)	if ((unsigned)(n) > (h)) return(0)
 				/* cast to unsigned in case n is signed */
 
+#ifdef _KERNEL
+extern time_t (*gettod) __P((void));
+extern int (*settod) __P((long));
+#endif
 #endif /* _RTCLOCKVAR_H_ */
diff --git a/sys/arch/x68k/x68k/iodevice.h b/sys/arch/x68k/x68k/iodevice.h
index 9f33ba4b30d9..3301be127e22 100644
--- a/sys/arch/x68k/x68k/iodevice.h
+++ b/sys/arch/x68k/x68k/iodevice.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: iodevice.h,v 1.6 1999/03/16 16:30:23 minoura Exp $	*/
+/*	$NetBSD: iodevice.h,v 1.7 2002/05/14 02:03:03 matt Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995 Masaru Oki
@@ -358,7 +358,7 @@ struct IODEVICE
 
 #ifdef _KERNEL
 #ifndef LOCORE
-volatile struct IODEVICE *IODEVbase;
+extern volatile struct IODEVICE *IODEVbase;
 #endif
 
 #define mfp     (IODEVbase->io_mfp)