Nuke some options GENERIC residue.

1997-02-04 04:57:10 +00:00 · 1997-02-04 04:57:10 +00:00 · 19d153fc48
parent 1cec4494cb
commit 19d153fc48
26 changed files with 43 additions and 77 deletions
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.alpha,v 1.31 1997/02/04 04:31:55 perry Exp $
+#	$NetBSD: Makefile.alpha,v 1.32 1997/02/04 05:08:27 perry Exp $

 # Makefile for NetBSD
 #
@ -134,7 +134,7 @@ cleankernel:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${ALPHA}/alpha/Locore.c ${CFILES} ${ALPHA}/alpha/swapgeneric.c \
+	    ${ALPHA}/alpha/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.amiga,v 1.54 1997/02/04 04:31:57 perry Exp $
+#	$NetBSD: Makefile.amiga,v 1.55 1997/02/04 05:08:29 perry Exp $

 # Makefile for NetBSD
 #
@ -149,7 +149,7 @@ cleankernel:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${AMIGA}/amiga/Locore.c ${CFILES} ${AMIGA}/amiga/swapgeneric.c \
+	    ${AMIGA}/amiga/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/arm32/conf/Makefile.arm32
+++ b/sys/arch/arm32/conf/Makefile.arm32
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm32,v 1.23 1997/02/04 04:31:58 perry Exp $
+#	$NetBSD: Makefile.arm32,v 1.24 1997/02/04 05:08:30 perry Exp $

 # Makefile for NetBSD
 #
@ -133,7 +133,7 @@ cleankernel:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${ARM32}/arm32/Locore.c ${CFILES} ${ARM32}/arm32/swapgeneric.c \
+	    ${ARM32}/arm32/Locore.c ${CFILES}  \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/atari/conf/Makefile.atari
+++ b/sys/arch/atari/conf/Makefile.atari
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.atari,v 1.27 1997/02/04 04:31:59 perry Exp $
+#	$NetBSD: Makefile.atari,v 1.28 1997/02/04 05:08:32 perry Exp $

 # Makefile for NetBSD
 #
@ -134,7 +134,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${ATARI}/atari/Locore.c ${CFILES} ${ATARI}/atari/swapgeneric.c \
+	    ${ATARI}/atari/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/atari/include/cpu.h
+++ b/sys/arch/atari/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.19 1997/01/21 20:37:15 leo Exp $	*/
+/*	$NetBSD: cpu.h,v 1.20 1997/02/04 05:02:56 perry Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -266,11 +266,6 @@ int	nvram_uio __P((struct uio *));
 int	cachectl __P((int, caddr_t, int));
 int	dma_cachectl __P((caddr_t, int));

-/*
- * Prototypes from swapgeneric.c:
- */
-void	setconf __P((void));
-
 /*
 * Prototypes from trap.c:
 */
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.hp300,v 1.49 1997/02/04 04:32:00 perry Exp $
+#	$NetBSD: Makefile.hp300,v 1.50 1997/02/04 05:08:33 perry Exp $

 # Makefile for NetBSD
 #
@ -139,7 +139,7 @@ cleankernel:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${HP300}/hp300/Locore.c ${CFILES} ${HP300}/hp300/swapgeneric.c \
+	    ${HP300}/hp300/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.79 1997/02/04 04:32:04 perry Exp $
+#	$NetBSD: Makefile.i386,v 1.80 1997/02/04 05:08:34 perry Exp $

 # Makefile for NetBSD
 #
@ -132,7 +132,7 @@ cleankernel:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${I386}/i386/Locore.c ${CFILES} ${I386}/i386/swapgeneric.c \
+	    ${I386}/i386/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.38 1996/12/03 23:54:54 fvdl Exp $	*/
+/*	$NetBSD: cpu.h,v 1.39 1997/02/04 04:57:10 perry Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -178,11 +178,6 @@ void	vm86_gpfault __P((struct proc *, int));
 /* trap.c */
 void	child_return __P((struct proc *, struct trapframe));

-#ifdef GENERIC
-/* swapgeneric.c */
-void	setconf __P((void));
-#endif /* GENERIC */
-
 #endif /* _KERNEL */

 /* 
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mac68k,v 1.50 1997/02/04 04:32:08 perry Exp $
+#	$NetBSD: Makefile.mac68k,v 1.51 1997/02/04 05:08:36 perry Exp $

 # Makefile for NetBSD
 #
@ -134,7 +134,7 @@ clean:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${MAC68K}/mac68k/Locore.c ${CFILES} ${MAC68K}/mac68k/swapgeneric.c \
+	    ${MAC68K}/mac68k/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mvme68k,v 1.18 1997/02/04 04:32:10 perry Exp $
+#	$NetBSD: Makefile.mvme68k,v 1.19 1997/02/04 05:08:38 perry Exp $

 # Makefile for NetBSD
 #
@ -134,7 +134,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${MVME68K}/mvme68k/Locore.c ${CFILES} ${MVME68K}/mvme68k/swapgeneric.c \
+	    ${MVME68K}/mvme68k/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/ofppc/conf/Makefile.ofppc
+++ b/sys/arch/ofppc/conf/Makefile.ofppc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ofppc,v 1.3 1997/02/04 04:32:18 perry Exp $
+#	$NetBSD: Makefile.ofppc,v 1.4 1997/02/04 05:08:47 perry Exp $
 #
 # Makefile for NetBSD
 #
@ -140,7 +140,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-		${PPC}/powerpc/Locore.c ${CFILES} ${PPC}/powerpc/swapgeneric.c \
+		${PPC}/powerpc/Locore.c ${CFILES} \
 		ioconf.c param.c | \
 		grep -v 'static function .* unused'

--- a/sys/arch/pc532/conf/Makefile.pc532
+++ b/sys/arch/pc532/conf/Makefile.pc532
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pc532,v 1.36 1997/02/04 04:32:11 perry Exp $
+#	$NetBSD: Makefile.pc532,v 1.37 1997/02/04 05:08:40 perry Exp $

 # Makefile for NetBSD
 #
@ -125,7 +125,7 @@ clean:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${PC532}/pc532/Locore.c ${CFILES} ${PC532}/pc532/swapgeneric.c \
+	    ${PC532}/pc532/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/pc532/include/cpu.h
+++ b/sys/arch/pc532/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.19 1996/12/23 08:37:37 matthias Exp $	*/
+/*	$NetBSD: cpu.h,v 1.20 1997/02/04 04:57:12 perry Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -127,11 +127,6 @@ void	child_return __P((struct proc *, struct syscframe frame));
 /* vm_machdep.c */
 int kvtop __P((caddr_t));

-#ifdef GENERIC
-/* swapgeneric.c */
-void	setconf __P((void));
-#endif /* GENERIC */
-
 #endif /* _KERNEL */

 /* 
--- a/sys/arch/pica/conf/Makefile.pica
+++ b/sys/arch/pica/conf/Makefile.pica
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pica,v 1.11 1997/02/04 04:32:12 perry Exp $
+#	$NetBSD: Makefile.pica,v 1.12 1997/02/04 05:08:42 perry Exp $

 # Makefile for NetBSD
 #
@ -137,7 +137,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${PICA}/pica/Locore.c ${CFILES} ${PICA}/pica/swapgeneric.c \
+	    ${PICA}/pica/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/pica/pica/machdep.c
+++ b/sys/arch/pica/pica/machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.7 1996/10/13 03:31:43 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.8 1997/02/04 04:57:14 perry Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -205,11 +205,7 @@ mips_init(argc, argv, code)
 	/*
 	 * Look at arguments passed to us and compute boothowto.
 	 */
-#ifdef GENERIC
-	boothowto = RB_SINGLE | RB_ASKNAME;
-#else
 	boothowto = RB_SINGLE;
-#endif
 #ifdef KADB
 	boothowto |= RB_KDB;
 #endif
--- a/sys/arch/pmax/conf/Makefile.pmax
+++ b/sys/arch/pmax/conf/Makefile.pmax
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pmax,v 1.41 1997/02/04 04:32:17 perry Exp $
+#	$NetBSD: Makefile.pmax,v 1.42 1997/02/04 05:08:46 perry Exp $

 # Makefile for NetBSD
 #
@ -140,7 +140,7 @@ cleankernel:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${MIPS}/mips/Locore.c ${CFILES} ${PMAX}/pmax/swapgeneric.c \
+	    ${MIPS}/mips/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/powerpc/conf/Makefile.powerpc
+++ b/sys/arch/powerpc/conf/Makefile.powerpc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.3 1997/02/04 04:32:18 perry Exp $
+#	$NetBSD: Makefile.powerpc,v 1.4 1997/02/04 05:08:47 perry Exp $
 #
 # Makefile for NetBSD
 #
@ -140,7 +140,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-		${PPC}/powerpc/Locore.c ${CFILES} ${PPC}/powerpc/swapgeneric.c \
+		${PPC}/powerpc/Locore.c ${CFILES} \
 		ioconf.c param.c | \
 		grep -v 'static function .* unused'

--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@ -1,4 +1,4 @@
-# 	$NetBSD: Makefile.sparc,v 1.40 1997/02/04 04:32:19 perry Exp $
+# 	$NetBSD: Makefile.sparc,v 1.41 1997/02/04 05:08:49 perry Exp $

 # Makefile for NetBSD
 #
@ -130,7 +130,7 @@ clean:

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${SPARC}/sparc/Locore.c ${CFILES} ${SPARC}/sparc/swapgeneric.c \
+	    ${SPARC}/sparc/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3,v 1.54 1997/02/04 04:32:21 perry Exp $
+#	$NetBSD: Makefile.sun3,v 1.55 1997/02/04 05:08:50 perry Exp $

 # Makefile for NetBSD
 #
@ -156,7 +156,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${SUN3}/sun3/Locore.c ${CFILES} ${SUN3}/sun3/swapgeneric.c \
+	    ${SUN3}/sun3/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/sun3/include/machdep.h
+++ b/sys/arch/sun3/include/machdep.h
@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.h,v 1.3 1997/01/27 21:48:37 gwr Exp $	*/
+/*	$NetBSD: machdep.h,v 1.4 1997/02/04 04:57:15 perry Exp $	*/

 /*
 * Copyright (c) 1994 Gordon W. Ross
@ -153,7 +153,6 @@ void	sunmon_init __P((void));
 void	sunmon_reboot __P((char *));

 void	swapconf __P((void));
-void	swapgeneric __P((void));

 void	switch_exit __P((struct proc *));

--- a/sys/arch/sun3/sun3/machdep.h
+++ b/sys/arch/sun3/sun3/machdep.h
@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.h,v 1.3 1997/01/27 21:48:37 gwr Exp $	*/
+/*	$NetBSD: machdep.h,v 1.4 1997/02/04 04:57:15 perry Exp $	*/

 /*
 * Copyright (c) 1994 Gordon W. Ross
@ -153,7 +153,6 @@ void	sunmon_init __P((void));
 void	sunmon_reboot __P((char *));

 void	swapconf __P((void));
-void	swapgeneric __P((void));

 void	switch_exit __P((struct proc *));

--- a/sys/arch/sun3/sun3/stub.c
+++ b/sys/arch/sun3/sun3/stub.c
@ -1,4 +1,4 @@
-/*	$NetBSD: stub.c,v 1.15 1997/01/27 19:41:20 gwr Exp $	*/
+/*	$NetBSD: stub.c,v 1.16 1997/02/04 04:57:16 perry Exp $	*/

 /*-
 * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -42,14 +42,8 @@

 #include <sys/cdefs.h>

-void swapgeneric __P((void));
 void Debugger __P((void));

-/* Called by autoconf.c */
-#ifndef	GENERIC
-void swapgeneric() {}
-#endif
-
 /*
 * XXX: isr.c:netintr() - move to conf.c?
 */
--- a/sys/arch/sun3x/conf/Makefile.sun3x
+++ b/sys/arch/sun3x/conf/Makefile.sun3x
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3x,v 1.2 1997/02/04 04:32:22 perry Exp $
+#	$NetBSD: Makefile.sun3x,v 1.3 1997/02/04 05:08:52 perry Exp $

 # Makefile for NetBSD
 #
@ -161,7 +161,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${SUN3X}/sun3x/Locore.c ${CFILES} ${SUN3X}/sun3x/swapgeneric.c \
+	    ${SUN3X}/sun3x/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'

--- a/sys/arch/sun3x/include/machdep.h
+++ b/sys/arch/sun3x/include/machdep.h
@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.h,v 1.5 1997/01/27 22:09:50 gwr Exp $	*/
+/*	$NetBSD: machdep.h,v 1.6 1997/02/04 04:57:17 perry Exp $	*/

 /*
 * Copyright (c) 1994 Gordon W. Ross
@ -171,7 +171,6 @@ void	sunmon_init __P((void));
 void	sunmon_reboot __P((char *));

 void	swapconf __P((void));
-void	swapgeneric __P((void));

 void	switch_exit __P((struct proc *));

--- a/sys/arch/sun3x/sun3x/stub.c
+++ b/sys/arch/sun3x/sun3x/stub.c
@ -1,4 +1,4 @@
-/*	$NetBSD: stub.c,v 1.1.1.1 1997/01/14 20:57:09 gwr Exp $	*/
+/*	$NetBSD: stub.c,v 1.2 1997/02/04 04:57:18 perry Exp $	*/

 /*-
 * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -42,14 +42,8 @@

 #include <sys/cdefs.h>

-void swapgeneric __P((void));
 void Debugger __P((void));

-/* Called by autoconf.c */
-#ifndef	GENERIC
-void swapgeneric() {}
-#endif
-
 /*
 * XXX: isr.c:netintr() - move to conf.c?
 */
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.vax,v 1.29 1997/02/04 04:32:24 perry Exp $
+#	$NetBSD: Makefile.vax,v 1.30 1997/02/04 05:08:54 perry Exp $

 # Makefile for NetBSD
 #
@ -122,7 +122,7 @@ clean::

 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${VAX}/vax/Locore.c ${CFILES} ${VAX}/vax/swapgeneric.c \
+	    ${VAX}/vax/Locore.c ${CFILES} \
 	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'