21 files changed, 17 insertions, 47 deletions

diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index a07c34b552cca..ba934584bf1b9 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.56 1996/02/05 14:23:19 davidg Exp $
+ *	$Id: vm_machdep.c,v 1.57 1996/03/03 01:57:45 jkh Exp $
  */
 
 #include "npx.h"
@@ -53,7 +53,6 @@
 #include <sys/vmmeter.h>
 
 #include <machine/clock.h>
-#include <machine/cpu.h>
 #include <machine/md_var.h>
 
 #include <vm/vm.h>
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 6f8ec9e9e0488..bbdb30318a425 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.16 1996/03/12 06:20:14 peter Exp $
+ *  $Id: linux_misc.c,v 1.17 1996/03/19 15:02:34 bde Exp $
  */
 
 #include <sys/param.h>
@@ -61,9 +61,6 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <machine/cpu.h>
-#include <machine/psl.h>
-
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 #include <i386/linux/linux_util.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index a07c34b552cca..ba934584bf1b9 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.56 1996/02/05 14:23:19 davidg Exp $
+ *	$Id: vm_machdep.c,v 1.57 1996/03/03 01:57:45 jkh Exp $
  */
 
 #include "npx.h"
@@ -53,7 +53,6 @@
 #include <sys/vmmeter.h>
 
 #include <machine/clock.h>
-#include <machine/cpu.h>
 #include <machine/md_var.h>
 
 #include <vm/vm.h>
diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index 9d2f3bfe77b79..9c3a81a3354a1 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_eg.c,v 1.11 1996/01/26 09:27:17 phk Exp $
+ * $Id: if_eg.c,v 1.12 1996/02/06 18:50:39 wollman Exp $
  */
 
 /* To do:
@@ -74,7 +74,6 @@
 #include <net/bpfdesc.h>
 #endif
 
-#include <machine/cpu.h>
 #include <machine/clock.h>
 
 #include <i386/isa/isa.h>
diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c
index e0b076d63c64e..006803591c350 100644
--- a/sys/i386/isa/qcam.c
+++ b/sys/i386/isa/qcam.c
@@ -51,7 +51,6 @@
 #include	<sys/devfsext.h>
 #endif /* DEVFS */
 
-#include	<machine/cpu.h>
 #include	<machine/clock.h>
 #include	<machine/qcam.h>
 
diff --git a/sys/i386/isa/qcamio.c b/sys/i386/isa/qcamio.c
index b8999ebf1897a..62a1d3bc50272 100644
--- a/sys/i386/isa/qcamio.c
+++ b/sys/i386/isa/qcamio.c
@@ -39,7 +39,6 @@
 #if NQCAM > 0
 
 #include	<sys/param.h>
-#include	<machine/cpu.h>
 #include	<machine/cpufunc.h>
 #include	<machine/clock.h>
 #ifdef	KERNEL
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index 507d875f9a60d..39fdf6fca37ea 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id$
+ * $Id: random_machdep.c,v 1.4 1995/12/29 08:04:32 markm Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 
 #include <machine/clock.h>
-#include <machine/cpu.h>
 #include <machine/random.h>
 
 #include <i386/isa/isa.h>
diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c
index 09777d187f24e..0a81a947453ab 100644
--- a/sys/i386/isa/wd7000.c
+++ b/sys/i386/isa/wd7000.c
@@ -65,7 +65,6 @@
 #include <sys/devconf.h>
 
 #include <machine/clock.h>
-#include <machine/cpu.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 6f8ec9e9e0488..bbdb30318a425 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.16 1996/03/12 06:20:14 peter Exp $
+ *  $Id: linux_misc.c,v 1.17 1996/03/19 15:02:34 bde Exp $
  */
 
 #include <sys/param.h>
@@ -61,9 +61,6 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <machine/cpu.h>
-#include <machine/psl.h>
-
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 #include <i386/linux/linux_util.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 83d5c65592b2c..0c86eafa0fc6e 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.29 1996/03/11 02:24:21 hsu Exp $
+ * $Id: kern_exit.c,v 1.30 1996/03/11 06:03:22 hsu Exp $
  */
 
 #include "opt_ktrace.h"
@@ -65,7 +65,6 @@
 #include <sys/shm.h>
 #include <sys/sem.h>
 
-#include <machine/cpu.h>
 #ifdef COMPAT_43
 #include <machine/reg.h>
 #include <machine/psl.h>
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index 507d875f9a60d..39fdf6fca37ea 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id$
+ * $Id: random_machdep.c,v 1.4 1995/12/29 08:04:32 markm Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 
 #include <machine/clock.h>
-#include <machine/cpu.h>
 #include <machine/random.h>
 
 #include <i386/isa/isa.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 623f033daee27..248d24ccea81f 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.13 1995/12/14 08:31:37 phk Exp $
+ * $Id: kern_time.c,v 1.14 1995/12/26 01:07:20 bde Exp $
  */
 
 #include <sys/param.h>
@@ -43,8 +43,6 @@
 #include <sys/proc.h>
 #include <sys/vnode.h>
 
-#include <machine/cpu.h>
-
 struct timezone tz;
 
 /*
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 70c2b39503f9d..ffbcbec983ea7 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- *	$Id: if_disc.c,v 1.10 1995/12/03 19:08:55 bde Exp $
+ *	$Id: if_disc.c,v 1.11 1996/02/06 18:51:11 wollman Exp $
  */
 
 /*
@@ -47,7 +47,6 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 9adc8efd87132..e31352759bc10 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.13 1995/12/20 21:53:40 wollman Exp $
+ * $Id: if_ethersubr.c,v 1.14 1996/01/24 21:09:06 phk Exp $
  */
 
 #include <sys/param.h>
@@ -46,8 +46,6 @@
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 
-#include <machine/cpu.h>
-
 #include <net/if.h>
 #include <net/netisr.h>
 #include <net/route.h>
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 0824ede1b4019..8a2c1316761a1 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.5 1995/05/30 08:08:05 rgrimes Exp $
+ * $Id: if_fddisubr.c,v 1.6 1995/10/26 20:30:11 julian Exp $
  */
 
 #include <sys/param.h>
@@ -45,8 +45,6 @@
 #include <sys/errno.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
-
 #include <net/if.h>
 #include <net/netisr.h>
 #include <net/route.h>
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 790311bcc6779..894a4b5f20718 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.17 1996/02/05 19:34:27 wollman Exp $
+ * $Id: if_loop.c,v 1.18 1996/02/06 18:51:11 wollman Exp $
  */
 
 /*
@@ -48,7 +48,6 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index c633ab0922f00..363aeaf9158ff 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.30 1996/01/24 21:09:18 phk Exp $ */
+/* $Id: if_ppp.c,v 1.31 1996/02/06 18:51:12 wollman Exp $ */
 /* from if_ppp.c,v 1.5 1995/08/16 01:36:38 paulus Exp */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
@@ -117,7 +117,6 @@
 #include <net/ppp_defs.h>
 #include <net/if_ppp.h>
 #include <net/if_pppvar.h>
-#include <machine/cpu.h>
 
 #ifdef PPP_COMPRESS
 #define PACKETPTR	struct mbuf *
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index fc6b8611e50d2..8ed72685ed114 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.35 1995/12/14 09:53:14 phk Exp $
+ * $Id: if_sl.c,v 1.36 1996/02/06 18:51:14 wollman Exp $
  */
 
 /*
@@ -85,8 +85,6 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 
-#include <machine/cpu.h>
-
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 928f62cd77840..15fb9578c9bf4 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -37,8 +37,6 @@
 #endif /*DEVFS*/
 #include <sys/conf.h>
 
-#include <machine/cpu.h>
-
 #include <net/if.h>
 #include <net/netisr.h>
 #include <net/route.h>
diff --git a/sys/pci/wd82371.c b/sys/pci/wd82371.c
index b078a5b98be98..e92248cf95415 100644
--- a/sys/pci/wd82371.c
+++ b/sys/pci/wd82371.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: wd82371.c,v 1.1 1996/01/28 22:15:47 wollman Exp $
+ *	$Id: wd82371.c,v 1.2 1996/01/30 19:04:09 wollman Exp $
  */
 
 #include "pci.h"
@@ -42,7 +42,6 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/cpu.h>
 #include <machine/pmap.h>	/* for vtophys */
 
 #include <i386/isa/wdreg.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 96abfb25fdae6..257875c38d7f1 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.43 1996/03/11 06:11:39 hsu Exp $
+ * $Id: vm_glue.c,v 1.44 1996/04/03 05:23:36 dyson Exp $
  */
 
 #include "opt_ddb.h"
@@ -92,7 +92,6 @@
 #include <sys/user.h>
 
 #include <machine/stdarg.h>
-#include <machine/cpu.h>
 
 /*
  * System initialization