Merging w/ NetBSD 021796.

speaker upgraded to the current.
some changes to the VM stuff (ie kern_thread.c added and so).

7 files changed, 16 insertions, 35 deletions

diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index 9ac9966cc95..a18a047cb29 100644
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.26 1995/06/26 06:55:58 cgd Exp $	*/
+/*	$NetBSD: param.h,v 1.27 1996/02/01 22:30:47 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -43,7 +43,7 @@
  */
 
 #ifdef _KERNEL
-#ifdef LOCORE
+#ifdef _LOCORE
 #include <machine/psl.h>
 #else
 #include <machine/cpu.h>
diff --git a/sys/arch/i386/include/pccons.h b/sys/arch/i386/include/pccons.h
index 9ea704e6a4d..f1eb362d867 100644
--- a/sys/arch/i386/include/pccons.h
+++ b/sys/arch/i386/include/pccons.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccons.h,v 1.3 1995/03/28 18:17:02 jtc Exp $	*/
+/*	$NetBSD: pccons.h,v 1.4 1996/02/02 18:06:06 mycroft Exp $	*/
 
 /*
  * pccons.h -- pccons ioctl definitions
@@ -7,11 +7,7 @@
 #ifndef _PCCONS_H_
 #define _PCCONS_H_
 
-#ifndef _KERNEL
 #include <sys/ioctl.h>
-#else
-#include "ioctl.h"
-#endif
 
 #define CONSOLE_X_MODE_ON		_IO('t',121)
 #define CONSOLE_X_MODE_OFF		_IO('t',122)
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index fe10012495b..af53627a5ed 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: pmap.h,v 1.2 1996/02/28 15:03:41 mickey Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.3 1996/03/19 21:09:27 mickey Exp $	*/
+/*	$NetBSD: pmap.h,v 1.22 1996/02/12 21:12:29 christos Exp $	*/
 
 /* 
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -84,7 +85,6 @@ extern int	PTDpaddr;	/* physical address of kernel PTD */
 void pmap_bootstrap __P((vm_offset_t start));
 boolean_t pmap_testbit __P((vm_offset_t, int));
 void pmap_changebit __P((vm_offset_t, int, int));
-__pure int pmap_page_index __P((vm_offset_t));
 #endif
 
 /*
diff --git a/sys/arch/i386/include/pmap.old.h b/sys/arch/i386/include/pmap.old.h
index 309b1df5379..20e1d3ff2da 100644
--- a/sys/arch/i386/include/pmap.old.h
+++ b/sys/arch/i386/include/pmap.old.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: pmap.old.h,v 1.2 1996/02/28 15:03:41 mickey Exp $	*/
+/*	$OpenBSD: pmap.old.h,v 1.3 1996/03/19 21:09:27 mickey Exp $	*/
+/*	$NetBSD: pmap.h,v 1.22 1996/02/12 21:12:29 christos Exp $	*/
 
 /* 
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -84,7 +85,6 @@ extern int	PTDpaddr;	/* physical address of kernel PTD */
 void pmap_bootstrap __P((vm_offset_t start));
 boolean_t pmap_testbit __P((vm_offset_t, int));
 void pmap_changebit __P((vm_offset_t, int, int));
-__pure int pmap_page_index __P((vm_offset_t));
 #endif
 
 /*
diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h
index 504708dfe52..8f9fbd87901 100644
--- a/sys/arch/i386/include/psl.h
+++ b/sys/arch/i386/include/psl.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: psl.h,v 1.26 1996/01/07 21:48:35 mycroft Exp $	*/
+/*	$NetBSD: psl.h,v 1.27 1996/02/01 22:30:56 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -97,22 +97,7 @@
 #define	SIR_TTYMASK	((1 << SIR_TTY) | SIR_CLOCKMASK)
 #define	SIR_ALLMASK	(SIR_CLOCKMASK | SIR_NETMASK | SIR_TTYMASK)
 
-#ifndef LOCORE
-
-/*
- * Interrupt handler chains.  isa_intr_establish() inserts a handler into
- * the list.  The handler is called with its (single) argument.
- */
-
-struct intrhand {
-	int	(*ih_fun)();
-	void	*ih_arg;
-	u_long	ih_count;
-	struct	intrhand *ih_next;
-	int	ih_level;
-	int	ih_irq;
-	char	*ih_what;
-};
+#ifndef _LOCORE
 
 volatile int cpl, ipending, astpending;
 int imask[5];
@@ -206,7 +191,7 @@ softintr(mask)
 #define	setsoftnet()	softintr(1 << SIR_NET)
 #define	setsofttty()	softintr(1 << SIR_TTY)
 
-#endif /* !LOCORE */
+#endif /* !_LOCORE */
 #endif /* _KERNEL */
 
 #endif /* !_I386_PSL_H_ */
diff --git a/sys/arch/i386/include/pte.h b/sys/arch/i386/include/pte.h
index 925b48ae168..1cc848378a9 100644
--- a/sys/arch/i386/include/pte.h
+++ b/sys/arch/i386/include/pte.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pte.h,v 1.8 1995/03/28 18:17:15 jtc Exp $	*/
+/*	$NetBSD: pte.h,v 1.9 1996/02/01 22:30:59 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -57,7 +57,7 @@
 #define	PDOFSET		(NBPD-1)	/* byte offset into page dir */
 #define	NPTEPD		(NBPD / NBPG)
 
-#ifndef LOCORE
+#ifndef _LOCORE
 typedef int	pd_entry_t;		/* page directory entry */
 typedef int	pt_entry_t;		/* Mach page table entry */
 #endif
@@ -94,7 +94,7 @@ typedef int	pt_entry_t;		/* Mach page table entry */
 #define PGEX_W		0x02	/* during a Write cycle */
 #define PGEX_U		0x04	/* access from User mode (UPL) */
 
-#ifndef LOCORE
+#ifndef _LOCORE
 #ifdef _KERNEL
 /* utilities defined in pmap.c */
 extern	pt_entry_t *Sysmap;
diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h
index a33824797cd..a1a332e23f3 100644
--- a/sys/arch/i386/include/segments.h
+++ b/sys/arch/i386/include/segments.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: segments.h,v 1.22 1995/12/20 18:09:24 mycroft Exp $	*/
+/*	$NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -70,7 +70,7 @@
 #define	KERNELMODE(c, f)	(ISPL(c) == SEL_KPL)
 #endif
 
-#ifndef LOCORE
+#ifndef _LOCORE
 
 #if __GNUC__ == 2 && __GNUC_MINOR__ < 7
 #pragma pack(1)
@@ -136,7 +136,7 @@ void setsegment __P((struct segment_descriptor *, void *, size_t, int, int,
     int, int));
 #endif /* _KERNEL */
 
-#endif /* !LOCORE */
+#endif /* !_LOCORE */
 
 /* system segments and gate types */
 #define	SDT_SYSNULL	 0	/* system null */