summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/machdep.c7
-rw-r--r--sys/amd64/amd64/trap.c5
-rw-r--r--sys/i386/i386/machdep.c7
-rw-r--r--sys/i386/i386/trap.c5
-rw-r--r--sys/kern/subr_trap.c5
5 files changed, 17 insertions, 12 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index bf1f8bf0..d6db6e6 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,17 +35,18 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.276 1997/12/03 16:27:33 sef Exp $
+ * $Id: machdep.c,v 1.277 1997/12/04 14:35:39 jkh Exp $
*/
#include "apm.h"
#include "npx.h"
-#include "opt_sysvipc.h"
-#include "opt_ddb.h"
#include "opt_bounce.h"
+#include "opt_cpu.h"
+#include "opt_ddb.h"
#include "opt_maxmem.h"
#include "opt_perfmon.h"
#include "opt_smp.h"
+#include "opt_sysvipc.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index e8a8ea0..8c45d1f 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,15 +35,16 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.116 1997/12/03 02:45:50 sef Exp $
+ * $Id: trap.c,v 1.117 1997/12/04 14:35:40 jkh Exp $
*/
/*
* 386 Trap and System call handling
*/
-#include "opt_ktrace.h"
+#include "opt_cpu.h"
#include "opt_ddb.h"
+#include "opt_ktrace.h"
#include "opt_vm86.h"
#include <sys/param.h>
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index bf1f8bf0..d6db6e6 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,17 +35,18 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.276 1997/12/03 16:27:33 sef Exp $
+ * $Id: machdep.c,v 1.277 1997/12/04 14:35:39 jkh Exp $
*/
#include "apm.h"
#include "npx.h"
-#include "opt_sysvipc.h"
-#include "opt_ddb.h"
#include "opt_bounce.h"
+#include "opt_cpu.h"
+#include "opt_ddb.h"
#include "opt_maxmem.h"
#include "opt_perfmon.h"
#include "opt_smp.h"
+#include "opt_sysvipc.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index e8a8ea0..8c45d1f 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,15 +35,16 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.116 1997/12/03 02:45:50 sef Exp $
+ * $Id: trap.c,v 1.117 1997/12/04 14:35:40 jkh Exp $
*/
/*
* 386 Trap and System call handling
*/
-#include "opt_ktrace.h"
+#include "opt_cpu.h"
#include "opt_ddb.h"
+#include "opt_ktrace.h"
#include "opt_vm86.h"
#include <sys/param.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index e8a8ea0..8c45d1f 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,15 +35,16 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.116 1997/12/03 02:45:50 sef Exp $
+ * $Id: trap.c,v 1.117 1997/12/04 14:35:40 jkh Exp $
*/
/*
* 386 Trap and System call handling
*/
-#include "opt_ktrace.h"
+#include "opt_cpu.h"
#include "opt_ddb.h"
+#include "opt_ktrace.h"
#include "opt_vm86.h"
#include <sys/param.h>
OpenPOWER on IntegriCloud