diff options
| -rw-r--r-- | sys/arch/alpha/conf/Makefile.alpha | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/Makefile.hp300 | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/Makefile.hppa | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/Makefile.mac68k | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/Makefile.macppc | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/conf/Makefile.mvme68k | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/Makefile.mvme88k | 4 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/conf/Makefile.mvmeppc | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/Makefile.sparc | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/Makefile.sparc64 | 2 | ||||
| -rw-r--r-- | sys/conf/swapgeneric.c | 57 |
12 files changed, 78 insertions, 21 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 9e969b25857..cd874c0b584 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.29 2003/05/13 22:45:06 miod Exp $ +# $OpenBSD: Makefile.alpha,v 1.30 2003/05/23 22:16:16 tedu Exp $ # $NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $ # Makefile for OpenBSD @@ -129,7 +129,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${CFILES} ${ALPHA}/alpha/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index f329c738c49..2c4100f19c6 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.32 2003/05/13 22:45:10 miod Exp $ +# $OpenBSD: Makefile.hp300,v 1.33 2003/05/23 22:16:16 tedu Exp $ # $NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $ # Makefile for OpenBSD @@ -176,7 +176,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${CFILES} ${HP300}/hp300/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index 53e193d9e51..6779f89e21d 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.19 2003/05/07 18:28:14 mickey Exp $ +# $OpenBSD: Makefile.hppa,v 1.20 2003/05/23 22:16:16 tedu Exp $ # Makefile for OpenBSD # @@ -157,7 +157,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${CFILES} ${HPPA}/hppa/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 0c659a5d96a..0b29d908857 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.36 2003/05/13 22:45:10 miod Exp $ +# $OpenBSD: Makefile.i386,v 1.37 2003/05/23 22:16:16 tedu Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -147,7 +147,7 @@ clean:: lint: @lint -hbxncez -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \ - ${CFILES} ${I386}/i386/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 698e11f74ee..f7c85e16a42 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.31 2003/05/13 22:45:10 miod Exp $ +# $OpenBSD: Makefile.mac68k,v 1.32 2003/05/23 22:16:16 tedu Exp $ # $NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $ # Makefile for OpenBSD @@ -149,7 +149,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \ - ${CFILES} ${MAC68K}/mac68k/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index ab2287d8207..399f2a55028 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.14 2003/05/14 05:10:57 jason Exp $ +# $OpenBSD: Makefile.macppc,v 1.15 2003/05/23 22:16:16 tedu Exp $ # # Makefile for OpenBSD PowerPC # @@ -143,7 +143,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${MACPPC}/macppc/Locore.c ${CFILES} ${MACPPC}/macppc/swapgeneric.c \ + ${MACPPC}/macppc/Locore.c ${CFILES} \ ioconf.c param.c | \ grep -v 'static function .* unused' diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index abda7ba1f02..30597ff0a55 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.21 2003/05/13 22:45:10 miod Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.22 2003/05/23 22:16:16 tedu Exp $ # This makefile is constructed from a machine description: # config machineid @@ -147,7 +147,7 @@ clean:: lint: /tmp param.c @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \ - ${CFILES} ${MVME68K}/mvme68k/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'struct/union .* never defined' | \ grep -v 'possible pointer alignment problem' diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index a9e34cf2b79..b0fd452d744 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.25 2003/05/13 22:45:10 miod Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.26 2003/05/23 22:16:16 tedu Exp $ # # Makefile for OpenBSD # @@ -153,7 +153,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \ - ${CFILES} ${MVME88K}/mvme88k/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'struct/union .* never defined' | \ grep -v 'possible pointer alignment problem' diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index a8ab50925f7..df44f7fb2ec 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.13 2003/05/13 22:45:11 miod Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.14 2003/05/23 22:16:16 tedu Exp $ # # Makefile for OpenBSD PowerPC # @@ -143,7 +143,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${PPC}/mvmeppc/Locore.c ${CFILES} ${PPC}/mvmeppc/swapgeneric.c \ + ${PPC}/mvmeppc/Locore.c \ ioconf.c param.c | \ grep -v 'static function .* unused' diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index 33328bfaced..81ee4161e87 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.30 2003/05/13 22:45:11 miod Exp $ +# $OpenBSD: Makefile.sparc,v 1.31 2003/05/23 22:16:16 tedu Exp $ # $NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $ # Makefile for OpenBSD @@ -149,7 +149,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \ - ${CFILES} ${SPARC}/sparc/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index 2b0fa99ec51..dbda25e5973 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -121,7 +121,7 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \ - ${CFILES} ${SPARC64}/sparc64/swapgeneric.c ioconf.c param.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/conf/swapgeneric.c b/sys/conf/swapgeneric.c new file mode 100644 index 00000000000..17bfc57bb1c --- /dev/null +++ b/sys/conf/swapgeneric.c @@ -0,0 +1,57 @@ +/* $OpenBSD: swapgeneric.c,v 1.1 2003/05/23 22:16:16 tedu Exp $ */ +/* $NetBSD: swapgeneric.c,v 1.12 1996/05/03 19:42:28 christos Exp $ */ + +/*- + * Copyright (c) 1990 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)swapgeneric.c 5.5 (Berkeley) 5/9/91 + */ + +/* + * fake swapgeneric.c -- should do this differently. + */ + +#include <sys/param.h> +#include <sys/conf.h> + +int (*mountroot)(void) = NULL; /* tells autoconf.c that we are "generic" */ + +dev_t rootdev = NODEV; +dev_t dumpdev = NODEV; + +struct swdevt swdevt[] = { + { NODEV, 0, 0 }, /* to be filled in */ + { NODEV, 0, 0 } +}; |