kill Locore.c

20 files changed, 29 insertions, 836 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index ab66b0b0c69..2431ed9607a 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.14 1997/07/06 01:34:35 millert Exp $
+#	$OpenBSD: Makefile.alpha,v 1.15 1997/09/15 02:40:24 deraadt Exp $
 #	$NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $
 
 # Makefile for OpenBSD
@@ -135,8 +135,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${ALPHA}/alpha/Locore.c ${CFILES} ${ALPHA}/alpha/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${ALPHA}/alpha/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/amiga/amiga/Locore.c b/sys/arch/amiga/amiga/Locore.c
deleted file mode 100644
index cde2bb1ee44..00000000000
--- a/sys/arch/amiga/amiga/Locore.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*	$OpenBSD: Locore.c,v 1.4 1997/01/16 09:23:12 niklas Exp $	*/
-/*	$NetBSD: Locore.c,v 1.15 1996/11/06 20:19:21 cgd Exp $	*/
-
-/*
- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- *
- *	@(#)Locore.c	7.4 (Berkeley) 5/7/91
- */
-
-#include <machine/pte.h>
-#include <machine/cpu.h>
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/user.h>
-#include <sys/vm.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/proc.h>
-#include <sys/buf.h>
-#include <sys/msgbuf.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/domain.h>
-#include <sys/map.h>
-#include <sys/dkbad.h>
-
-/*
- * Pseudo file for lint to show what is used/defined in locore.s.
- */
-
-int	machineid;
-int	mmutype;
-int	ectype;
-struct	user u;
-int	icode[8];
-int	szicode = sizeof (icode);
-u_int	lowram;
-u_char	ssir;
-int	Usrptsize;
-
-/*
- * Variables declared for savecore, or
- * implicitly, such as by config or the loader.
- */
-char	version[] = "4.3 BSD UNIX ....";
-int	etext;
-
-doadump() { dumpsys(); doboot(); }
-
-lowinit()
-{
-#if !defined(GPROF)
-	caddr_t cp;
-#endif
-	struct frame frame;
-	extern int dumpmag;
-	extern int rthashsize;
-	extern int arptab_size;
-	extern int dk_ndrive;
-	extern struct domain unixdomain;
-#ifdef INET
-	extern struct domain inetdomain;
-#endif
-#include "imp.h"
-#if NIMP > 0
-	extern struct domain impdomain;
-#endif
-#ifdef NS
-	extern struct domain nsdomain;
-#endif
-
-	/* cpp messes these up for lint so put them here */
-	unixdomain.dom_next = domains;
-	domains = &unixdomain;
-#ifdef INET
-	inetdomain.dom_next = domains;
-	domains = &inetdomain;
-#endif
-#if NIMP > 0
-	impdomain.dom_next = domains;
-	domains = &impdomain;
-#endif
-#ifdef NS
-	nsdomain.dom_next = domains;
-	domains = &nsdomain;
-#endif
-	dumpmag = 0;			/* used only by savecore */
-	rthashsize = rthashsize;	/* used by netstat, etc. */
-	arptab_size = arptab_size;	/* used by arp command */
-	dk_ndrive = dk_ndrive;		/* used by vmstat, iostat, etc. */
-
-	/*
-	 * Pseudo-uses of globals.
-	 */
-	lowinit();
-	machineid = machineid;
-	mmutype = mmutype;
-	ectype = ectype;
-	lowram = lowram;
-	ssir = ssir;
-	maxmem = physmem = freemem = 0;
-	u = u;
-	Usrptsize = Usrptsize;
-	main(0);
-
-	/*
-	 * Routines called from interrupt vectors.
-	 */
-	panic("Machine check");
-	printf("Write timeout");
-	hilint();
-	if (dmaintr())
-		return;
-	intrhand(0);
-	regdump((int *)0, 0);
-	hardclock((caddr_t)0, 0);
-	nmihand(frame);
-	softclock((caddr_t)0, 0);
-	trap(0, (unsigned)0, (unsigned)0, frame);
-	syscall(0, frame);
-	straytrap(0);
-
-	/*
-	 * Miscellaneous routines called from configurable
-	 * drivers.
-	 */
-	disksort((struct buf *)0, (struct buf *)0);
-	if (vmemall((struct pte *)0, 0, (struct proc *)0, 0))
-		return;		/* use value */
-	boothowto = 0;
-/*	dumpflag = 0; dumpflag = dumpflag; */
-#if !defined(GPROF)
-	cp = (caddr_t)&etext;
-	cp = cp;
-#endif
-}
-
-int	cold = 1;
-
-struct	pte Sysmap[SYSPTSIZE];
-struct	pte Usrptmap[USRPTSIZE];
-int	Usrptsize;
-struct	pte usrpt[USRPTSIZE*NPTEPG];
-struct	pte Forkmap[UPAGES];
-struct	user forkutl;
-struct	pte Xswapmap[UPAGES];
-struct	user xswaputl;
-struct	pte Xswap2map[UPAGES];
-struct	user xswap2utl;
-struct	pte Swapmap[UPAGES];
-struct	user swaputl;
-struct	pte Pushmap[UPAGES];
-struct	user pushutl;
-struct	pte Vfmap[UPAGES];
-struct	user vfutl;
-struct	pte CMAP1;
-char	CADDR1[NBPG];
-struct	pte CMAP2;
-char	CADDR2[NBPG];
-struct	pte vmpte[1];
-char	vmmap[NBPG];
-struct	pte Mbmap[NMBCLUSTERS/CLSIZE];
-char	mbutl[NMBCLUSTERS][MCLBYTES];
-struct	pte msgbufmap[CLSIZE];
-struct	msgbuf msgbuf;
-struct	pte kmempt[200], ekmempt[1];
-struct	pte Intiomap[IIOMAPSIZE], Extiomap[EIOMAPSIZE];
-char	intiobase[IIOMAPSIZE*NBPG], extiobase[EIOMAPSIZE*NBPG];
-struct	pte Usriomap[USRIOSIZE];
-char	usrio[USRIOSIZE*NBPG];
-struct	ste Sysseg[NPTEPG];
-
-/*ARGSUSED*/
-ovbcopy(from, to, len) caddr_t from, to; unsigned len; { }
-copyinstr(udaddr, kaddr, maxlength, lencopied)
-    caddr_t udaddr, kaddr; size_t maxlength, *lencopied;
-{ *kaddr = *udaddr; *lencopied = maxlength; return (0); }
-copyoutstr(kaddr, udaddr, maxlength, lencopied)
-    caddr_t kaddr, udaddr; size_t maxlength, *lencopied;
-{ *udaddr = *kaddr; *lencopied = maxlength; return (0); }
-copystr(kfaddr, kdaddr, maxlength, lencopied)
-    caddr_t kfaddr, kdaddr; size_t maxlength, *lencopied;
-{ *kdaddr = *kfaddr; *lencopied = maxlength; return (0); }
-
-/*ARGSUSED*/
-copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; size_t n; { return (0); }
-/*ARGSUSED*/
-copyout(kaddr, udaddr, n) caddr_t kaddr, udaddr; size_t n; { return (0); }
-
-/*ARGSUSED*/
-longjmp(lp) label_t *lp; { /*NOTREACHED*/ }
-
-/*ARGSUSED*/
-savectx(pcbp) struct pcb *pcbp; { return (0); }
-
-/*ARGSUSED*/
-setrunqueue(p) struct proc *p; { }
-
-/*ARGSUSED*/
-remrunqueue(p) struct proc *p; { }
-
-swtch() { if (whichqs) whichqs = 0; }
-
-/*ARGSUSED*/
-fubyte(base) caddr_t base; { return (0); }
-#ifdef notdef
-/*ARGSUSED*/
-fuibyte(base) caddr_t base; { return (0); }
-#endif
-/*ARGSUSED*/
-subyte(base, i) caddr_t base; { return (0); }
-/*ARGSUSED*/
-suibyte(base, i) caddr_t base; { return (0); }
-/*ARGSUSED*/
-fuword(base) caddr_t base; { return (0); }
-/*ARGSUSED*/
-fuiword(base) caddr_t base; { return (0); }
-/*ARGSUSED*/
-suword(base, i) caddr_t base; { return (0); }
-/*ARGSUSED*/
-suiword(base, i) caddr_t base; { return (0); }
-
-/*ARGSUSED*/
-copyseg(udaddr, pf)
-    caddr_t udaddr; unsigned pf;
-{ CMAP1 = CMAP1; CADDR1[0] = CADDR1[0]; }
-
-/*ARGSUSED*/
-clearseg(pf) unsigned pf; { CMAP2 = CMAP2; CADDR2[0] = CADDR2[0]; }
-
-TBIA() { }
-/*ARGSUSED*/
-TBIS(addr) caddr_t addr; { }
-TBIAS() { }
-TBIAU() { }
-ICIA() { }
-DCIA() { }
-DCIS() { }
-DCIU() { }
-PCIA() { }
-ecacheon() { }
-ecacheoff() { }
-
-getsfc() { return (0); }
-getdfc() { return (0); }
-
-/*ARGSUSED*/
-loadustp(ustp) int ustp; { }
-/*ARGSUSED*/
-flushustp(ustp) int ustp; { }
-
-/*ARGSUSED*/
-ploadw(addr) caddr_t addr; { }
-
-/*ARGSUSED*/
-addupc(pc, prof, counts) int pc; struct uprof *prof; int counts; { }
-
-spl0() { }
-splsoftclock() { return (0); }
-splsoftnet() { return (0); }
-spl1() { return (0); }
-spl2() { return (0); }
-spl3() { return (0); }
-spl4() { return (0); }
-splbio() { return (0); }
-splnet() { return (0); }
-spltty() { return (0); }
-splimp() { return (0); }
-spl5() { return (0); }
-splclock() { return (0); }
-spl6() { return (0); }
-splhigh() { return (0); }
-spl7() { return (0); }
-
-/*ARGSUSED*/
-splx(s) int s; { }
-
-/*ARGSUSED*/
-_insque(p, q) caddr_t p, q; { }
-/*ARGSUSED*/
-_remque(p) caddr_t p; { }
-
-/*ARGSUSED*/
-bcopy(from, to, len) caddr_t from, to; unsigned len; { }
-/*ARGSUSED*/
-bzero(base, count) caddr_t base; unsigned count; { }
-/*ARGSUSED*/
-blkclr(base, count) caddr_t base; unsigned count; { }
-/*ARGSUSED*/
-bcmp(str1, str2, count) caddr_t str1, str2; unsigned count; { return (0); }
-
-/*ARGSUSED*/
-strlen(str) caddr_t str; { return (0); }
-
-/*ARGSUSED*/
-setjmp(lp) label_t *lp; { return (0); }
-
-/*ARGSUSED*/
-qsetjmp(lp) label_t *lp; { return (0); }
-
-/*ARGSUSED*/
-scanc(size, cp, table, mask)
-    unsigned size; u_char *cp, table[]; int mask;
-{ return (0); }
-
-/*ARGSUSED*/
-skpc(mask, size, cp) int mask; int size; char *cp; { return (0); }
-
-/*ARGSUSED*/
-ffs(v) long v; { return (0); }
-
-#ifdef FPCOPROC
-/*ARGSUSED*/
-m68881_save(fpframep) struct fpframe *fpframep; { }
-/*ARGSUSED*/
-m68881_restore(fpframep) struct fpframe *fpframep; { }
-#endif
-
-doboot() { /*NOTREACHED*/ }
diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
index c8c8e48bb22..a67b578207f 100644
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amiga,v 1.20 1997/03/27 15:50:12 niklas Exp $
+#	$OpenBSD: Makefile.amiga,v 1.21 1997/09/15 02:40:25 deraadt Exp $
 #	$NetBSD: Makefile.amiga,v 1.52 1996/12/01 12:10:07 veego Exp $
 
 # Makefile for OpenBSD
@@ -154,8 +154,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${AMIGA}/amiga/Locore.c ${CFILES} ${AMIGA}/amiga/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${AMIGA}/amiga/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/arc/conf/Makefile.arc b/sys/arch/arc/conf/Makefile.arc
index 7cad217f631..7a52c5d757e 100644
--- a/sys/arch/arc/conf/Makefile.arc
+++ b/sys/arch/arc/conf/Makefile.arc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.arc,v 1.8 1997/05/21 10:06:49 pefo Exp $
+#	$OpenBSD: Makefile.arc,v 1.9 1997/09/15 02:40:26 deraadt Exp $
 
 #	@(#)Makefile.arc	8.2 (Berkeley) 2/16/94
 #
@@ -118,8 +118,7 @@ clean::
 
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
-	    ${ARC}/arc/Locore.c ${CFILES} \
-	    ioconf.c param.c
+	    ${CFILES} ioconf.c param.c
 
 symbols.sort: ${ARC}/arc/symbols.raw
 	grep -v '^#' ${ARC}/arc/symbols.raw \
diff --git a/sys/arch/arm32/conf/Makefile.arm32 b/sys/arch/arm32/conf/Makefile.arm32
index 10cc987869f..00ab84a7cab 100644
--- a/sys/arch/arm32/conf/Makefile.arm32
+++ b/sys/arch/arm32/conf/Makefile.arm32
@@ -129,8 +129,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
-	    ${ARM32}/arm32/Locore.c ${CFILES} ${ARM32}/arm32/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${ARM32}/arm32/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/atari/atari/Locore.c b/sys/arch/atari/atari/Locore.c
deleted file mode 100644
index b83dfc67c80..00000000000
--- a/sys/arch/atari/atari/Locore.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*	$NetBSD: Locore.c,v 1.3 1995/08/13 00:05:07 mycroft Exp $	*/
-
-/*
- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- *
- *	@(#)Locore.c	7.4 (Berkeley) 5/7/91
- */
-
-#include <machine/pte.h>
-#include <machine/cpu.h>
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/user.h>
-#include <sys/vm.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/proc.h>
-#include <sys/buf.h>
-#include <sys/msgbuf.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/domain.h>
-#include <sys/map.h>
-#include <sys/dkbad.h>
-
-/*
- * Pseudo file for lint to show what is used/defined in locore.s.
- */
-
-int	machineid;
-int	mmutype;
-int	ectype;
-struct	user u;
-int	icode[8];
-int	szicode = sizeof (icode);
-u_int	lowram;
-u_char	ssir;
-int	Usrptsize;
-
-/*
- * Variables declared for savecore, or
- * implicitly, such as by config or the loader.
- */
-char	version[] = "4.3 BSD UNIX ....";
-int	etext;
-
-doadump() { dumpsys(); doboot(); }
-
-lowinit()
-{
-#if !defined(GPROF)
-	caddr_t cp;
-#endif
-	struct frame frame;
-	extern int dumpmag;
-	extern int rthashsize;
-	extern int arptab_size;
-	extern int dk_ndrive;
-	extern struct domain unixdomain;
-#ifdef INET
-	extern struct domain inetdomain;
-#endif
-#include "imp.h"
-#if NIMP > 0
-	extern struct domain impdomain;
-#endif
-#ifdef NS
-	extern struct domain nsdomain;
-#endif
-
-	/* cpp messes these up for lint so put them here */
-	unixdomain.dom_next = domains;
-	domains = &unixdomain;
-#ifdef INET
-	inetdomain.dom_next = domains;
-	domains = &inetdomain;
-#endif
-#if NIMP > 0
-	impdomain.dom_next = domains;
-	domains = &impdomain;
-#endif
-#ifdef NS
-	nsdomain.dom_next = domains;
-	domains = &nsdomain;
-#endif
-	dumpmag = 0;			/* used only by savecore */
-	rthashsize = rthashsize;	/* used by netstat, etc. */
-	arptab_size = arptab_size;	/* used by arp command */
-	dk_ndrive = dk_ndrive;		/* used by vmstat, iostat, etc. */
-
-	/*
-	 * Pseudo-uses of globals.
-	 */
-	lowinit();
-	machineid = machineid;
-	mmutype = mmutype;
-	ectype = ectype;
-	lowram = lowram;
-	ssir = ssir;
-	maxmem = physmem = freemem = 0;
-	u = u;
-	Usrptsize = Usrptsize;
-	main(0);
-
-	/*
-	 * Routines called from interrupt vectors.
-	 */
-	panic("Machine check");
-	printf("Write timeout");
-	hilint();
-	if (dmaintr())
-		return;
-	intrhand(0);
-	regdump((int *)0, 0);
-	hardclock((caddr_t)0, 0);
-	nmihand(frame);
-	softclock((caddr_t)0, 0);
-	trap(0, (unsigned)0, (unsigned)0, frame);
-	syscall(0, frame);
-	straytrap(0);
-
-	/*
-	 * Miscellaneous routines called from configurable
-	 * drivers.
-	 */
-	disksort((struct buf *)0, (struct buf *)0);
-	if (vmemall((struct pte *)0, 0, (struct proc *)0, 0))
-		return;		/* use value */
-	boothowto = 0;
-/*	dumpflag = 0; dumpflag = dumpflag; */
-#if !defined(GPROF)
-	cp = (caddr_t)&etext;
-	cp = cp;
-#endif
-}
-
-int	cold = 1;
-
-struct	pte Sysmap[SYSPTSIZE];
-struct	pte Usrptmap[USRPTSIZE];
-int	Usrptsize;
-struct	pte usrpt[USRPTSIZE*NPTEPG];
-struct	pte Forkmap[UPAGES];
-struct	user forkutl;
-struct	pte Xswapmap[UPAGES];
-struct	user xswaputl;
-struct	pte Xswap2map[UPAGES];
-struct	user xswap2utl;
-struct	pte Swapmap[UPAGES];
-struct	user swaputl;
-struct	pte Pushmap[UPAGES];
-struct	user pushutl;
-struct	pte Vfmap[UPAGES];
-struct	user vfutl;
-struct	pte CMAP1;
-char	CADDR1[NBPG];
-struct	pte CMAP2;
-char	CADDR2[NBPG];
-struct	pte vmpte[1];
-char	vmmap[NBPG];
-struct	pte Mbmap[NMBCLUSTERS/CLSIZE];
-char	mbutl[NMBCLUSTERS][MCLBYTES];
-struct	pte msgbufmap[CLSIZE];
-struct	msgbuf msgbuf;
-struct	pte kmempt[200], ekmempt[1];
-struct	pte Intiomap[IIOMAPSIZE], Extiomap[EIOMAPSIZE];
-char	intiobase[IIOMAPSIZE*NBPG], extiobase[EIOMAPSIZE*NBPG];
-struct	pte Usriomap[USRIOSIZE];
-char	usrio[USRIOSIZE*NBPG];
-struct	ste Sysseg[NPTEPG];
-
-/*ARGSUSED*/
-ovbcopy(from, to, len) caddr_t from, to; unsigned len; { }
-copyinstr(udaddr, kaddr, maxlength, lencopied)
-    caddr_t udaddr, kaddr; u_int maxlength, *lencopied;
-{ *kaddr = *udaddr; *lencopied = maxlength; return (0); }
-copyoutstr(kaddr, udaddr, maxlength, lencopied)
-    caddr_t kaddr, udaddr; u_int maxlength, *lencopied;
-{ *udaddr = *kaddr; *lencopied = maxlength; return (0); }
-copystr(kfaddr, kdaddr, maxlength, lencopied)
-    caddr_t kfaddr, kdaddr; u_int maxlength, *lencopied;
-{ *kdaddr = *kfaddr; *lencopied = maxlength; return (0); }
-
-/*ARGSUSED*/
-copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; u_int n; { return (0); }
-/*ARGSUSED*/
-copyout(kaddr, udaddr, n) caddr_t kaddr, udaddr; u_int n; { return (0); }
-
-/*ARGSUSED*/
-longjmp(lp) label_t *lp; { /*NOTREACHED*/ }
-
-/*ARGSUSED*/
-savectx(pcbp) struct pcb *pcbp; { return (0); }
-
-/*ARGSUSED*/
-setrunqueue(p) struct proc *p; { }
-
-/*ARGSUSED*/
-remrunqueue(p) struct proc *p; { }
-
-swtch() { if (whichqs) whichqs = 0; }
-
-/*ARGSUSED*/
-fubyte(base) caddr_t base; { return (0); }
-#ifdef notdef
-/*ARGSUSED*/
-fuibyte(base) caddr_t base; { return (0); }
-#endif
-/*ARGSUSED*/
-subyte(base, i) caddr_t base; { return (0); }
-/*ARGSUSED*/
-suibyte(base, i) caddr_t base; { return (0); }
-/*ARGSUSED*/
-fuword(base) caddr_t base; { return (0); }
-/*ARGSUSED*/
-fuiword(base) caddr_t base; { return (0); }
-/*ARGSUSED*/
-suword(base, i) caddr_t base; { return (0); }
-/*ARGSUSED*/
-suiword(base, i) caddr_t base; { return (0); }
-
-/*ARGSUSED*/
-copyseg(udaddr, pf)
-    caddr_t udaddr; unsigned pf;
-{ CMAP1 = CMAP1; CADDR1[0] = CADDR1[0]; }
-
-/*ARGSUSED*/
-clearseg(pf) unsigned pf; { CMAP2 = CMAP2; CADDR2[0] = CADDR2[0]; }
-
-TBIA() { }
-/*ARGSUSED*/
-TBIS(addr) caddr_t addr; { }
-TBIAS() { }
-TBIAU() { }
-ICIA() { }
-DCIA() { }
-DCIS() { }
-DCIU() { }
-PCIA() { }
-ecacheon() { }
-ecacheoff() { }
-
-getsfc() { return (0); }
-getdfc() { return (0); }
-
-/*ARGSUSED*/
-loadustp(ustp) int ustp; { }
-/*ARGSUSED*/
-flushustp(ustp) int ustp; { }
-
-/*ARGSUSED*/
-ploadw(addr) caddr_t addr; { }
-
-/*ARGSUSED*/
-addupc(pc, prof, counts) int pc; struct uprof *prof; int counts; { }
-
-spl0() { }
-splsoftclock() { return (0); }
-splsoftnet() { return (0); }
-spl1() { return (0); }
-spl2() { return (0); }
-spl3() { return (0); }
-spl4() { return (0); }
-splbio() { return (0); }
-splnet() { return (0); }
-spltty() { return (0); }
-splimp() { return (0); }
-spl5() { return (0); }
-splclock() { return (0); }
-spl6() { return (0); }
-splhigh() { return (0); }
-spl7() { return (0); }
-
-/*ARGSUSED*/
-splx(s) int s; { }
-
-/*ARGSUSED*/
-_insque(p, q) caddr_t p, q; { }
-/*ARGSUSED*/
-_remque(p) caddr_t p; { }
-
-/*ARGSUSED*/
-bcopy(from, to, len) caddr_t from, to; unsigned len; { }
-/*ARGSUSED*/
-bzero(base, count) caddr_t base; unsigned count; { }
-/*ARGSUSED*/
-blkclr(base, count) caddr_t base; unsigned count; { }
-/*ARGSUSED*/
-bcmp(str1, str2, count) caddr_t str1, str2; unsigned count; { return (0); }
-
-/*ARGSUSED*/
-strlen(str) caddr_t str; { return (0); }
-
-/*ARGSUSED*/
-setjmp(lp) label_t *lp; { return (0); }
-
-/*ARGSUSED*/
-qsetjmp(lp) label_t *lp; { return (0); }
-
-/*ARGSUSED*/
-scanc(size, cp, table, mask)
-    unsigned size; u_char *cp, table[]; int mask;
-{ return (0); }
-
-/*ARGSUSED*/
-skpc(mask, size, cp) int mask; int size; char *cp; { return (0); }
-
-/*ARGSUSED*/
-locc(mask, size, cp) int mask; char *cp; unsigned size; { return (0); }
-
-/*ARGSUSED*/
-ffs(v) long v; { return (0); }
-
-#ifdef FPCOPROC
-/*ARGSUSED*/
-m68881_save(fpframep) struct fpframe *fpframep; { }
-/*ARGSUSED*/
-m68881_restore(fpframep) struct fpframe *fpframep; { }
-#endif
-
-doboot() { /*NOTREACHED*/ }
diff --git a/sys/arch/atari/conf/Makefile.atari b/sys/arch/atari/conf/Makefile.atari
index 8ad37573186..a856179b5a0 100644
--- a/sys/arch/atari/conf/Makefile.atari
+++ b/sys/arch/atari/conf/Makefile.atari
@@ -111,8 +111,7 @@ clean::
 
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
-	    ${ATARI}/atari/Locore.c ${CFILES} ${ATARI}/atari/swapgeneric.c \
-	    ioconf.c param.c| \
+	    ${CFILES} ${ATARI}/atari/swapgeneric.c ioconf.c param.c| \
 	    grep -v 'struct/union .* never defined' | \
 	    grep -v 'possible pointer alignment problem'
 
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index a7d6712785a..719a5d3f4e2 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.16 1997/04/20 07:01:10 downsj Exp $
+#	$OpenBSD: Makefile.hp300,v 1.17 1997/09/15 02:40:28 deraadt Exp $
 #	$NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $
 
 # Makefile for OpenBSD
@@ -130,8 +130,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${HP300}/hp300/Locore.c ${CFILES} ${HP300}/hp300/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${HP300}/hp300/swapgeneric.c 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 bc57aa51ce1..2502d6abc98 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.19 1997/05/29 00:43:19 niklas Exp $
+#	$OpenBSD: Makefile.i386,v 1.20 1997/09/15 02:40:29 deraadt Exp $
 #	$NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -147,8 +147,7 @@ clean::
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
-	    ${I386}/i386/Locore.c ${CFILES} ${I386}/i386/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${I386}/i386/swapgeneric.c 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 7938556f6fb..471cb464311 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.15 1997/05/29 00:16:05 niklas Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.16 1997/09/15 02:40:30 deraadt Exp $
 #	$NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $
 
 # Makefile for OpenBSD
@@ -137,8 +137,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
-	    ${MAC68K}/mac68k/Locore.c ${CFILES} ${MAC68K}/mac68k/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${MAC68K}/mac68k/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 4b929ef061f..707250b1ecc 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.8 1997/03/31 00:23:54 downsj Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.9 1997/09/15 02:40:31 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -126,8 +126,7 @@ clean::
 
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
-	    ${MVME68K}/mvme68k/Locore.c ${CFILES} ${MVME68K}/mvme68k/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${MVME68K}/mvme68k/swapgeneric.c 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 76569d72b01..154ea761bff 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,5 +1,5 @@
 #	@(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
-#	$Id: Makefile.mvme88k,v 1.2 1997/05/24 03:02:28 rahnds Exp $
+#	$Id: Makefile.mvme88k,v 1.3 1997/09/15 02:40:32 deraadt Exp $
 #
 # Makefile for NetBSD
 #
@@ -127,8 +127,7 @@ clean::
 
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC -Dvolatile= ${CFLAGS} ${CPPFLAGS} ${PARAM} -UKGDB \
-	    ${MVME88K}/mvme88k/Locore.c ${CFILES} ${MVME88K}/mvme88k/swapgeneric.c \
-	    ioconf.c param.c| \
+	    ${CFILES} ${MVME88K}/mvme88k/swapgeneric.c ioconf.c param.c| \
 	    grep -v 'struct/union .* never defined' | \
 	    grep -v 'possible pointer alignment problem'
 
diff --git a/sys/arch/pc532/conf/Makefile.pc532 b/sys/arch/pc532/conf/Makefile.pc532
index 9783acc0a74..a3b01a3ad36 100644
--- a/sys/arch/pc532/conf/Makefile.pc532
+++ b/sys/arch/pc532/conf/Makefile.pc532
@@ -81,7 +81,7 @@ clean::
 
 #lint: /tmp param.c
 #	@lint -hbxn -I. -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
-#	  ${I386}/i386/Locore.c ${CFILES} 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/pmax/conf/Makefile.pmax b/sys/arch/pmax/conf/Makefile.pmax
index c67aad8f3d3..05d69b7de57 100644
--- a/sys/arch/pmax/conf/Makefile.pmax
+++ b/sys/arch/pmax/conf/Makefile.pmax
@@ -156,8 +156,7 @@ clean::
 
 lint:
 	@lint -hbxncez -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
-	    ${CFILES} ${PMAX}/pmax/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${PMAX}/pmax/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/powerpc/conf/Makefile.powerpc b/sys/arch/powerpc/conf/Makefile.powerpc
index e56fa79cc15..4e4bb94a878 100644
--- a/sys/arch/powerpc/conf/Makefile.powerpc
+++ b/sys/arch/powerpc/conf/Makefile.powerpc
@@ -136,8 +136,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-		${PPC}/powerpc/Locore.c ${CFILES} ${PPC}/powerpc/swapgeneric.c \
-		ioconf.c param.c | \
+		${CFILES} ${PPC}/powerpc/swapgeneric.c ioconf.c param.c | \
 		grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/powerpc/powerpc/Locore.c b/sys/arch/powerpc/powerpc/Locore.c
deleted file mode 100644
index e42ca6d71ed..00000000000
--- a/sys/arch/powerpc/powerpc/Locore.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$OpenBSD: Locore.c,v 1.3 1996/12/28 06:21:33 rahnds Exp $	*/
-/*	$NetBSD: Locore.c,v 1.2 1996/11/06 20:19:50 cgd Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * All rights reserved.
- *
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- */
-
-/*
- * Some additional routines that happened to be in locore.S traditionally,
- * but have no need to be coded in assembly.
- */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-
-int whichqs;
-
-/*
- * Put process p on the run queue indicated by its priority.
- * Calls should be made at splstatclock(), and p->p_stat should be SRUN.
- */
-void
-setrunqueue(p)
-	struct proc *p;
-{
-	struct  prochd *q;
-	struct proc *oldlast;
-	int which = p->p_priority >> 2;
-	
-#ifdef	DIAGNOSTIC
-	if (p->p_back)
-		panic("setrunqueue");
-#endif
-	q = &qs[which];
-	whichqs |= 0x80000000 >> which;
-	p->p_forw = (struct proc *)q;
-	p->p_back = oldlast = q->ph_rlink;
-	q->ph_rlink = p;
-	oldlast->p_forw = p;
-}
-
-/*
- * Remove process p from its run queue, which should be the one
- * indicated by its priority.
- * Calls should be made at splstatclock().
- */
-void
-remrunqueue(p)
-	struct proc *p;
-{
-	int which = p->p_priority >> 2;
-	struct prochd *q;
-
-#ifdef	DIAGNOSTIC	
-	if (!(whichqs & (0x80000000 >> which)))
-		panic("remrunqueue");
-#endif
-	p->p_forw->p_back = p->p_back;
-	p->p_back->p_forw = p->p_forw;
-	p->p_back = NULL;
-	q = &qs[which];
-	if (q->ph_link == (struct proc *)q)
-		whichqs &= ~(0x80000000 >> which);
-}
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index c761deb800b..c503cc0d5ef 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc,v 1.13 1997/08/24 22:57:36 downsj Exp $
+#	$OpenBSD: Makefile.sparc,v 1.14 1997/09/15 02:40:35 deraadt Exp $
 # 	$NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $
 
 # Makefile for OpenBSD
@@ -149,8 +149,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
-	    ${SPARC}/sparc/Locore.c ${CFILES} ${SPARC}/sparc/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${SPARC}/sparc/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index 0fbe44e8894..933ffc8272a 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sun3,v 1.20 1997/06/09 19:45:29 kstailey Exp $
+#	$OpenBSD: Makefile.sun3,v 1.21 1997/09/15 02:40:36 deraadt Exp $
 #	$NetBSD: Makefile.sun3,v 1.51 1996/09/09 21:07:08 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -138,8 +138,7 @@ clean::
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${SUN3}/sun3/Locore.c ${CFILES} ${SUN3}/sun3/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${SUN3}/sun3/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index b83e9b5c413..e57994dd61a 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.6 1997/09/10 07:34:19 maja Exp $
+#	$OpenBSD: Makefile.vax,v 1.7 1997/09/15 02:40:37 deraadt Exp $
 #	$NetBSD: Makefile.vax,v 1.32 1997/03/14 23:27:35 mycroft Exp $
 
 # Makefile for NetBSD
@@ -124,8 +124,7 @@ cleankernel:
 
 lint:
 	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${VAX}/vax/Locore.c ${CFILES} ${VAX}/vax/swapgeneric.c \
-	    ioconf.c param.c | \
+	    ${CFILES} ${VAX}/vax/swapgeneric.c ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
diff --git a/sys/arch/wgrisc/conf/Makefile.wgrisc b/sys/arch/wgrisc/conf/Makefile.wgrisc
index a1be8430600..c48b4a11c5a 100644
--- a/sys/arch/wgrisc/conf/Makefile.wgrisc
+++ b/sys/arch/wgrisc/conf/Makefile.wgrisc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.wgrisc,v 1.2 1997/02/23 21:59:25 pefo Exp $
+#	$OpenBSD: Makefile.wgrisc,v 1.3 1997/09/15 02:40:38 deraadt Exp $
 
 #	@(#)Makefile.wgrisc	8.2 (Berkeley) 2/16/94
 #
@@ -113,8 +113,7 @@ clean::
 
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
-	    ${WGRISC}/wgrisc/Locore.c ${CFILES} \
-	    ioconf.c param.c
+	    ${CFILES} ioconf.c param.c
 
 symbols.sort: ${WGRISC}/wgrisc/symbols.raw
 	grep -v '^#' ${WGRISC}/wgrisc/symbols.raw \