do not include machine/cpu.h from a .c file; it is the responsibility of

.h files to pull it in, if needed
ok tedu

25 files changed, 25 insertions, 51 deletions

diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index 0322e7c2b47..4b1650161fd 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.90 2013/01/15 01:34:27 deraadt Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.91 2013/03/28 16:55:25 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -87,7 +87,6 @@
 #include <sys/mman.h>
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
 #include <machine/reg.h>
 #include <machine/exec.h>
 
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 7f87fd6f1c1..51067dfae20 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.187 2013/03/25 14:58:28 markus Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.188 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -83,7 +83,6 @@
 
 #include <ufs/ufs/quota.h>
 
-#include <machine/cpu.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 7aec79d3e69..5f8ff077fc1 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_clock.c,v 1.79 2013/03/12 09:37:16 mpi Exp $	*/
+/*	$OpenBSD: kern_clock.c,v 1.80 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $	*/
 
 /*-
@@ -52,7 +52,6 @@
 #include <sys/sched.h>
 #include <sys/timetc.h>
 
-#include <machine/cpu.h>
 
 #ifdef GPROF
 #include <sys/gmon.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 4ea7a68c5cc..83062ff016a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.132 2012/08/02 03:18:48 guenther Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.133 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -61,7 +61,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
 #include <machine/reg.h>
 
 #ifdef __HAVE_MD_TCB
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index c3db9084ed0..2681876b848 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.119 2012/09/08 14:52:00 kettenis Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.120 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -70,7 +70,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <machine/cpu.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 446de688ceb..f5ed894c2c7 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_kthread.c,v 1.31 2011/11/09 20:57:38 guenther Exp $	*/
+/*	$OpenBSD: kern_kthread.c,v 1.32 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $	*/
 
 /*-
@@ -40,7 +40,6 @@
 #include <sys/malloc.h>
 #include <sys/queue.h>
 
-#include <machine/cpu.h>
 
 /*
  * note that stdarg.h and the ansi style va_start macro is used for both
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 55c3c7bd868..d7a928bdc8f 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_lock.c,v 1.38 2011/08/28 02:35:34 guenther Exp $	*/
+/*	$OpenBSD: kern_lock.c,v 1.39 2013/03/28 16:55:25 deraadt Exp $	*/
 
 /* 
  * Copyright (c) 1995
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/sched.h>
 
-#include <machine/cpu.h>
 
 /*
  * Locking primitives implementation.
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index fc9ccbe80c2..ba49bb0d942 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.148 2013/02/08 04:30:37 guenther Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.149 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -66,7 +66,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <machine/cpu.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index e677212a987..74284df2e72 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_time.c,v 1.76 2012/11/05 19:39:35 miod Exp $	*/
+/*	$OpenBSD: kern_time.c,v 1.77 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <machine/cpu.h>
 
 struct timeval adjtimedelta;		/* unapplied time correction */
 
diff --git a/sys/kern/sched_bsd.c b/sys/kern/sched_bsd.c
index 6c5eb630b14..4185e3bb07a 100644
--- a/sys/kern/sched_bsd.c
+++ b/sys/kern/sched_bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sched_bsd.c,v 1.30 2012/07/09 17:27:32 haesbaert Exp $	*/
+/*	$OpenBSD: sched_bsd.c,v 1.31 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*-
@@ -52,7 +52,6 @@
 #include <sys/ktrace.h>
 #endif
 
-#include <machine/cpu.h>
 
 int	lbolt;			/* once a second sleep address */
 int	rrticks_init;		/* # of hardclock ticks per roundrobin() */
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 7459266b1b3..768d1647cf4 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_prf.c,v 1.76 2011/04/03 16:46:19 drahn Exp $	*/
+/*	$OpenBSD: subr_prf.c,v 1.77 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $	*/
 
 /*-
@@ -64,7 +64,6 @@
 
 #ifdef KGDB
 #include <sys/kgdb.h>
-#include <machine/cpu.h>
 #endif
 #ifdef DDB
 #include <ddb/db_output.h>	/* db_printf, db_putchar prototypes */
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 5289ab7f8b4..268216f7d98 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_prof.c,v 1.24 2013/03/12 09:37:16 mpi Exp $	*/
+/*	$OpenBSD: subr_prof.c,v 1.25 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $	*/
 
 /*-
@@ -41,7 +41,6 @@
 #include <sys/sysctl.h>
 #include <sys/syscallargs.h>
 
-#include <machine/cpu.h>
 
 #ifdef GPROF
 #include <sys/malloc.h>
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index e358a442fc7..f533b77c49e 100644
--- a/sys/kern/subr_xxx.c
+++ b/sys/kern/subr_xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_xxx.c,v 1.12 2010/09/28 20:27:56 miod Exp $	*/
+/*	$OpenBSD: subr_xxx.c,v 1.13 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: subr_xxx.c,v 1.10 1996/02/04 02:16:51 christos Exp $	*/
 
 /*
@@ -41,7 +41,6 @@
 #include <sys/device.h>
 #include <sys/conf.h>
 
-#include <machine/cpu.h>
 
 /*
  * Unsupported device function (e.g. writing to read-only device).
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 08c0ad0fdf9..f48f043ce6e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.170 2013/02/17 17:39:29 miod Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.171 2013/03/28 16:55:25 deraadt Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -87,7 +87,6 @@
 #include <sys/socketvar.h>
 #include <net/if.h>
 
-#include <machine/cpu.h>
 
 #include <uvm/uvm.h>
 #include <uvm/uvm_extern.h>
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index b07afc9b856..e84c5e9746c 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_atmsubr.c,v 1.32 2010/08/24 14:43:56 blambert Exp $       */
+/*      $OpenBSD: if_atmsubr.c,v 1.33 2013/03/28 16:55:27 deraadt Exp $       */
 
 /*
  *
@@ -87,7 +87,6 @@
 #include <sys/errno.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/netisr.h>
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 0a778f22a02..493f315397f 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.208 2013/03/28 16:45:16 tedu Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.209 2013/03/28 16:55:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -44,7 +44,6 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/kernel.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 19e3828ccaa..b1ea66c4ad2 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.154 2013/03/15 20:45:34 tedu Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.155 2013/03/28 16:55:27 deraadt Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -87,7 +87,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <sys/syslog.h>
 #include <sys/timeout.h>
 
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/netisr.h>
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 1fffd0df194..a4d44b6ebe5 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fddisubr.c,v 1.60 2010/08/24 14:43:56 blambert Exp $	*/
+/*	$OpenBSD: if_fddisubr.c,v 1.61 2013/03/28 16:55:27 deraadt Exp $	*/
 /*	$NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $	*/
 
 /*
@@ -85,7 +85,6 @@
 #include <sys/errno.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/netisr.h>
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 22620f2a78b..559535284cb 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.48 2013/03/10 13:15:48 claudio Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.49 2013/03/28 16:55:27 deraadt Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -116,7 +116,6 @@
 #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 a6200c136cf..09ee3257bc4 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.68 2013/03/26 13:19:26 mpi Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.69 2013/03/28 16:55:27 deraadt Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -150,7 +150,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 02f0f081097..134867e1d80 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sl.c,v 1.46 2013/03/28 16:45:16 tedu Exp $	*/
+/*	$OpenBSD: if_sl.c,v 1.47 2013/03/28 16:55:27 deraadt Exp $	*/
 /*	$NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $	*/
 
 /*
@@ -75,7 +75,6 @@
 #include <sys/systm.h>
 #endif
 
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index d6a2dc2b136..12a6bf8b5c3 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.100 2013/03/28 16:45:16 tedu Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.101 2013/03/28 16:55:27 deraadt Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -67,7 +67,6 @@
 #include <machine/random.h>
 #endif
 #if defined (__NetBSD__) || defined (__OpenBSD__)
-#include <machine/cpu.h> /* XXX for softnet */
 #endif
 #include <sys/stdarg.h>
 
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 55d2e07f9ca..c47d00db2cd 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.113 2013/03/26 13:19:26 mpi Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.114 2013/03/28 16:55:27 deraadt Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -56,7 +56,6 @@
 #include <sys/poll.h>
 #include <sys/conf.h>
 
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index b823118e482..6bfcb546eeb 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.c,v 1.202 2013/03/28 16:45:16 tedu Exp $	*/
+/*	$OpenBSD: ip_carp.c,v 1.203 2013/03/28 16:55:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -48,8 +48,6 @@
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 
-#include <machine/cpu.h>
-
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_llc.h>
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index bf8a5683125..859ab2b2be0 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.h,v 1.151 2013/03/04 00:41:54 dlg Exp $	*/
+/*	$OpenBSD: scsiconf.h,v 1.152 2013/03/28 16:55:27 deraadt Exp $	*/
 /*	$NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $	*/
 
 /*
@@ -54,7 +54,6 @@
 #include <sys/timeout.h>
 #include <sys/workq.h>
 #include <sys/mutex.h>
-#include <machine/cpu.h>
 #include <scsi/scsi_debug.h>
 
 static __inline void _lto2b(u_int32_t val, u_int8_t *bytes);